martin: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php.in, 1.2, 1.3

[cvs at intevation.de]

Author: martin

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
In directory doto:/tmp/cvs-serv30513/kolab-webadmin/www/admin/addressbook

Modified Files:
	addr.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- addr.php.in	21 Feb 2006 02:32:39 -0000	1.2
+++ addr.php.in	9 Mar 2006 21:27:22 -0000	1.3
@@ -316,7 +316,7 @@
 
 /**** Insert into template and output ***/
 $smarty =& new MySmarty();
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'messages', $messages );
 $smarty->assign( 'heading', $heading );
 $smarty->assign( 'uid', $auth->uid() );