gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusycache.class.php.in, 1.6, 1.7

cvs at kolab.org cvs at kolab.org
Wed Nov 1 10:32:29 CET 2006


Author: gunnar

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv29325/kolab-resource-handlers/freebusy

Modified Files:
	freebusycache.class.php.in 
Log Message:
	* freebusy/freebusycache.class.php.in: 

	Fixed freebusycache class for PHP5 (array_merge problems).


Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freebusycache.class.php.in	25 Oct 2006 02:28:57 -0000	1.6
+++ freebusycache.class.php.in	1 Nov 2006 09:32:27 -0000	1.7
@@ -192,7 +192,7 @@
       if( dba_exists( $uid, $db ) ) {
 	$tmplst = dba_fetch( $uid, $db );
 	myLog("Found ".$uid." := $tmplst", RM_LOG_DEBUG);
-	$lst = array_merge( $lst, $this->decodeList( $tmplst ) );
+	$lst = array_merge((array) $lst,(array) $this->decodeList( $tmplst ) );
       } else {
 	myLog("$uid not found", RM_LOG_DEBUG);	
       }
@@ -334,7 +334,7 @@
 	if($file=='.' || $file=='..') continue;
 	if( !ereg( ($this->extended?'/.*\.xpfb$/':'/.*\.pfb$/'), $file ) ) continue;
 	$tmp = $this->recursivedir( $dir.'/'.$file );
-	if( $tmp !== false ) $dirs = array_merge( $dirs, $tmp );
+	if( $tmp !== false ) $dirs = array_merge((array) $dirs,(array) $tmp );
       } else if( is_file($dir.'/'.$file) ) {
 	$dirs[] = $dir.'/'.$file;
       }





More information about the commits mailing list