gunnar: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php.in, 1.11, 1.12

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv28886/kolab-resource-handlers/resmgr

Modified Files:
	kolabfilter.php.in 
Log Message:
	* resmgr/kolabfilter.php.in ($addrs): 

	Fixed kolabfilter script for PHP5 (array_merge problems).


Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolabfilter.php.in	19 Oct 2006 20:56:26 -0000	1.11
+++ kolabfilter.php.in	1 Nov 2006 09:20:45 -0000	1.12
@@ -134,7 +134,7 @@
   }
   unset($entries[0]['mail']['count']);
   unset($entries[0]['alias']['count']);
-  $addrs = array_merge($entries[0]['mail'],$entries[0]['alias']);
+  $addrs = array_merge((array) $entries[0]['mail'],(array) $entries[0]['alias']);
   $mail = $entries[0]['mail'][0];
 
   ldap_free_result($result);
@@ -153,7 +153,7 @@
   foreach( $entries as $adr ) {
     if( $adr['mail']['count'] > 0 ) {
       unset($adr['mail']['count']);
-      $addrs = array_merge($addrs,$adr['mail']);
+      $addrs = array_merge((array) $addrs,(array) $adr['mail']);
     }
   }
   ldap_free_result($result);