fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16590] check for initialized before init


From: sigurdne
Subject: [Fmsystem-commits] [16590] check for initialized before init
Date: Tue, 18 Apr 2017 08:54:34 -0400 (EDT)

Revision: 16590
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16590
Author:   sigurdne
Date:     2017-04-18 08:54:34 -0400 (Tue, 18 Apr 2017)
Log Message:
-----------
check for initialized before init

Modified Paths:
--------------
    trunk/booking/inc/class.socommon.inc.php
    trunk/phpgwapi/inc/class.socommon.inc.php

Modified: trunk/booking/inc/class.socommon.inc.php
===================================================================
--- trunk/booking/inc/class.socommon.inc.php    2017-04-18 10:59:12 UTC (rev 
16589)
+++ trunk/booking/inc/class.socommon.inc.php    2017-04-18 12:54:34 UTC (rev 
16590)
@@ -576,7 +576,10 @@
                                                        while 
($this->db->next_record())
                                                        {
                                                                $id = 
$this->_unmarshal($this->db->f($key, false), 'int');
-                                                               
$results[$id_map[$id]][$field] = array();
+                                                               
if(!isset($results[$id_map[$id]][$field]))
+                                                               {
+                                                                       
$results[$id_map[$id]][$field] = array();
+                                                               }
                                                                $data = array();
                                                                foreach 
($params['manytomany']['column'] as $intOrCol => $paramsOrCol)
                                                                {

Modified: trunk/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.socommon.inc.php   2017-04-18 10:59:12 UTC (rev 
16589)
+++ trunk/phpgwapi/inc/class.socommon.inc.php   2017-04-18 12:54:34 UTC (rev 
16590)
@@ -304,7 +304,10 @@
                                                        while 
($this->db->next_record())
                                                        {
                                                                $id = 
$this->unmarshal($this->db->f($key, false), 'int');
-                                                               
$results[$id_map[$id]][$field] = array();
+                                                               
if(!isset($results[$id_map[$id]][$field]))
+                                                               {
+                                                                       
$results[$id_map[$id]][$field] = array();
+                                                               }
                                                                $data = array();
                                                                foreach 
($params['manytomany']['column'] as $intOrCol => $paramsOrCol)
                                                                {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]