Merged with Master

modules/Calendar/views/TaskManagement.php

@@ -99,7 +99,7 @@ class Calendar_TaskManagement_View extends Vtiger_Index_View {
 		if (!$request->get('colors')) {
 			$colors = array();
 			foreach ($priorities as $priority => $value) {
-                            $colors[$key] = $this->getColors($priority,$field->getName());
+				$colors[$priority] = $this->getColors($priority, $field->getName());
 			}
 		} else {
 			$colors = $request->get('colors');
@@ -107,14 +107,14 @@ class Calendar_TaskManagement_View extends Vtiger_Index_View {
 		return $colors;
 	}
 
-	public function getColors($priority,$fieldname){
+	public function getColors($priority, $fieldname){
 		$db=PearDatabase::getInstance();
-		if(isset($priorities)){
+		if(isset($priority)){
 			$tableName = "vtiger_$fieldname";
 			$result=$db->pquery("SELECT color FROM $tableName WHERE $fieldname=?",array($priority));
 			$no_of_row=$db->num_rows($result);
 			for($i=0;$i<$no_of_row;$i++){
-				$color = $db->query_result($result,$i,'color');
+				$color = $db->query_result($result, $i, 'color');
 			}
 		}
 		if($color=='#ffffff' || empty($color)) {