[Fmsystem-commits] [15371] controller: prepare for php7

[sigurdne]

Revision: 15371
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15371
Author:   sigurdne
Date:     2016-07-25 13:07:13 +0000 (Mon, 25 Jul 2016)
Log Message:
-----------
controller: prepare for php7

Modified Paths:
--------------
    trunk/controller/inc/class.socommon.inc.php
    trunk/controller/inc/class.uicontrol_group.inc.php
    trunk/controller/inc/class.uidocument.inc.php

Modified: trunk/controller/inc/class.socommon.inc.php
===================================================================
--- trunk/controller/inc/class.socommon.inc.php 2016-07-25 12:58:07 UTC (rev 
15370)
+++ trunk/controller/inc/class.socommon.inc.php 2016-07-25 13:07:13 UTC (rev 
15371)
@@ -150,7 +150,7 @@
                 */
                public function get_single( int $id )
                {
-                       $objects = $this->get(null, null, null, null, null, 
null, array($this->get_id_field_name() => $id));
+                       $objects = $this->get(0, 0, '', false, '', '', 
array($this->get_id_field_name() => $id));
                        if (count($objects) > 0)
                        {
                                $keys = array_keys($objects);

Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php  2016-07-25 12:58:07 UTC 
(rev 15370)
+++ trunk/controller/inc/class.uicontrol_group.inc.php  2016-07-25 13:07:13 UTC 
(rev 15371)
@@ -374,7 +374,7 @@
                                $building_part_options = 
$this->so->get_building_part_select_array($control_group->get_building_part_id());
 
                                $control_group_array = 
$control_group->toArray();
-                               $control_items_array = 
$this->so_control_item->get(null, null, 
'controller_control_item.control_area_id', true, null, null, array(
+                               $control_items_array = 
$this->so_control_item->get(0, 0, 'controller_control_item.control_area_id', 
true, '', '', array(
                                        'available' => 'yes'));
 
                                $control_items = array();
@@ -488,7 +488,7 @@
                                $building_part_options = 
$this->so->get_building_part_select_array($control_group->get_building_part_id());
 
                                $control_group_array = 
$control_group->toArray();
-                               $control_items_array = 
$this->so_control_item->get(null, null, 
'controller_control_item.control_area_id', true, null, null, array(
+                               $control_items_array = 
$this->so_control_item->get(0, 0, 'controller_control_item.control_area_id', 
true, '', '', array(
                                        'available' => 'yes'));
 
                                $control_items = array();

Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php       2016-07-25 12:58:07 UTC 
(rev 15370)
+++ trunk/controller/inc/class.uidocument.inc.php       2016-07-25 13:07:13 UTC 
(rev 15371)
@@ -464,7 +464,7 @@
                                        $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
                                }
 
-                               $documents = $this->so->get(null, null, null, 
null, null, null, array(
+                               $documents = $this->so->get(0, 0, '', false, 
'', '', array(
                                        'procedure_id' => $procedure_id,
                                        'type' => $document_type));