gunnar: server/kolab-resource-handlers/kolab-resource-handlers/resmgr misc.php, 1.5, 1.6
cvs at kolab.org
cvs at kolab.org
Wed Nov 1 10:23:26 CET 2006
Author: gunnar
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv28966/kolab-resource-handlers/resmgr
Modified Files:
misc.php
Log Message:
* resmgr/misc.php:
Fixed misc.php helper for PHP5 (array_merge problems).
Index: misc.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/misc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- misc.php 22 May 2006 10:49:29 -0000 1.5
+++ misc.php 1 Nov 2006 09:23:24 -0000 1.6
@@ -178,7 +178,7 @@
$i++;
}
$i--;
- if( array_key_exists($arg[1],$ret) && is_array( $ret[$arg[1]] ) ) $ret[$arg[1]] = array_merge($ret[$arg[1]] ,$val);
+ if( array_key_exists($arg[1],$ret) && is_array( $ret[$arg[1]] ) ) $ret[$arg[1]] = array_merge((array)$ret[$arg[1]] ,(array)$val);
else if( count($val) == 1 ) $ret[$arg[1]] = $val[0];
else $ret[$arg[1]] = $val;
}
More information about the commits
mailing list