[Fmsystem-commits] [10753]

[Torstein]

Revision: 10753
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10753
Author:   vator
Date:     2013-02-06 06:52:12 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicalendar.inc.php

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2013-02-06 06:48:20 UTC 
(rev 10752)
+++ trunk/controller/inc/class.uicalendar.inc.php       2013-02-06 06:52:12 UTC 
(rev 10753)
@@ -115,7 +115,7 @@
                        // Validates location_code. If not set, first location 
among assigned locations
                        $location_code = 
$this->validate_location_code($location_code);
 
-                       if ($location_code != null && $location_code = "")
+                       if ($location_code != null && $location_code != "")
                        {
                                $level = 
$this->get_location_level($location_code);
 
@@ -516,10 +516,8 @@
                                        $curr_location_code = 
$location['location_code'];
 
                                        $repeat_type = 
$control->get_repeat_type();
-                                       $location_with_check_lists = 
$this->so->get_check_lists_for_control_and_location($control_id, 
$curr_location_code, $from_date_ts, $to_date_ts, $repeat_type);
+                                       $check_lists_array = 
$this->so->get_check_lists_for_control_and_location($control_id, 
$curr_location_code, $from_date_ts, $to_date_ts, $repeat_type);
 
-                                       $check_lists_array = 
$location_with_check_lists["check_lists_array"];
-
                                        $year_calendar = new 
year_calendar($control, $year, null, $curr_location_code, "location");
                                        $calendar_array = 
$year_calendar->build_calendar($check_lists_array);
 
@@ -597,12 +595,9 @@
                                $curr_location_code = 
$location['location_code'];
 
                                $repeat_type = $control->get_repeat_type();
-                               $location_with_check_lists = 
$this->so->get_check_lists_for_control_and_location($control_id, 
$curr_location_code, $from_date_ts, $to_date_ts, $control->get_repeat_type());
+                               $check_lists_array = 
$this->so->get_check_lists_for_control_and_location($control_id, 
$curr_location_code, $from_date_ts, $to_date_ts, $control->get_repeat_type());
 
-                               $check_lists_array = 
$location_with_check_lists["check_lists_array"];
-
-
-                               $month_calendar = new month_calendar($control, 
$year, $month, null, $curr_location_code, "location");
+        $month_calendar = new month_calendar($control, $year, $month, null, 
$curr_location_code, "location");
                                $calendar_array = 
$month_calendar->build_calendar($check_lists_array);
 
                                $locations_with_calendar_array[] = 
array("location" => $location, "calendar_array" => $calendar_array);