fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [17642]


From: nelson . guerra
Subject: [Fmsystem-commits] [17642]
Date: Thu, 18 Jan 2018 19:21:22 -0500 (EST)

Revision: 17642
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17642
Author:   nelson224
Date:     2018-01-18 19:21:21 -0500 (Thu, 18 Jan 2018)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/calendar/inc/class.calendar_holiday.inc.php

Modified: branches/dev-syncromind/calendar/inc/class.calendar_holiday.inc.php
===================================================================
--- branches/dev-syncromind/calendar/inc/class.calendar_holiday.inc.php 
2018-01-19 00:21:06 UTC (rev 17641)
+++ branches/dev-syncromind/calendar/inc/class.calendar_holiday.inc.php 
2018-01-19 00:21:21 UTC (rev 17642)
@@ -52,10 +52,14 @@
                }
                if($phpgw_info['server']['auto_load_holidays'] == True)
                {
-                       while(list($key,$value) = each($this->users))
-                       {
+                       //while(list($key,$value) = each($this->users))
+                        if (is_array($this->users))
+                        {
+                            foreach($this->users as $key => $value)
+                            {
                                $this->is_network_load_needed($value);
-                       }
+                            }
+                        }
                }
        }
 
@@ -242,14 +246,18 @@
                $sql = 'SELECT * FROM phpgw_cal_holidays WHERE locale in (';
                $find_it = '';
                reset($this->users);
-               while(list($key,$value) = each($this->users))
-               {
+               //while(list($key,$value) = each($this->users))
+                if (is_array($this->users))
+                {
+                    foreach($this->users as $key => $value)
+                    {
                        if($find_it)
                        {
                                $find_it .= ',';
                        }
                        $find_it .= "'".$value."'";
-               }
+                    }
+                }
                $sql .= $find_it.')';
 
                return $sql;




reply via email to

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