[Fmsystem-commits] [13598] sync stable vs trunk at 13597

[Sigurd Nes]

Revision: 13598
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13598
Author:   sigurdne
Date:     2015-07-09 08:21:57 +0000 (Thu, 09 Jul 2015)
Log Message:
-----------
sync stable vs trunk at 13597

Modified Paths:
--------------
    
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record.php
    
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php

Modified: 
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record.php
===================================================================
--- 
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record.php
  2015-07-08 23:13:13 UTC (rev 13597)
+++ 
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record.php
  2015-07-09 08:21:57 UTC (rev 13598)
@@ -50,7 +50,6 @@
                                        $origin_location_code           = 
$this->db2->f('location_code');
                                        $origin_address                         
= $this->db2->f('address');
                                        $value_set['location_code'] = 
$origin_location_code;
-//                                     $value_set['p_num']             = 
$target_id;
                                        $value_set['p_num']             = 
$this->db2->f('target_id');
                                        $value_set['p_entity_id']       = 
$p_entity_id;
                                        $value_set['p_cat_id']          = 
$p_cat_id;

Modified: 
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
===================================================================
--- 
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
    2015-07-08 23:13:13 UTC (rev 13597)
+++ 
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
    2015-07-09 08:21:57 UTC (rev 13598)
@@ -16,7 +16,7 @@
        private $calendar_array = array();
        private $control_relation = array();
        
-  public function __construct($control, $year, $component, $location_code, 
$type, $control_relation)
+  public function __construct($control, $year, $component, $location_code, 
$type, $control_relation = array())
   {
     $this->year = $year;
     $this->control = $control;
@@ -105,7 +105,7 @@
                        $month_nr = date("n", 
$check_list_status_info->get_deadline_date_ts());
                        
                        $repeat_type = $check_list->get_repeat_type();
-//                     if( !isset($this->calendar_array[ $month_nr ]) || 
$repeat_type > $this->calendar_array[ $month_nr ]['repeat_type'])
+       //              if( !isset($this->calendar_array[ $month_nr ]) || 
$repeat_type > $this->calendar_array[ $month_nr ]['repeat_type'])
                        {
                                $this->calendar_array[ $month_nr 
]['repeat_type'] = $repeat_type;
                                $this->calendar_array[ $month_nr ]["status"] = 
$check_list_status_info->get_status();