martin: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer domainmaintainer.php.in, 1.1, 1.2

cvs at intevation.de cvs at intevation.de
Thu Mar 9 22:27:24 CET 2006


Author: martin

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

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


Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- domainmaintainer.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ domainmaintainer.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -337,7 +337,7 @@
 
 $smarty = new MySmarty();
 $smarty->assign( 'topdir', $topdir );
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );





More information about the commits mailing list