[Phpgroupware-cvs] [19075] switch from appending to array_merge - fixes #24698

[Dave Hall]

Revision: 19075
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19075
Author:   skwashd
Date:     2009-02-16 10:38:06 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
switch from appending to array_merge - fixes #24698

Modified Paths:
--------------
    branches/Version-0_9_16-branch/preferences/preferences.php

Modified: branches/Version-0_9_16-branch/preferences/preferences.php
===================================================================
--- branches/Version-0_9_16-branch/preferences/preferences.php  2009-02-16 
10:36:45 UTC (rev 19074)
+++ branches/Version-0_9_16-branch/preferences/preferences.php  2009-02-16 
10:38:06 UTC (rev 19075)
@@ -238,7 +238,7 @@
                $vars = $GLOBALS['phpgw']->preferences->vars;
                if (is_array($vars2))
                {
-                       $vars += $vars2;
+                       $vars = array_merge($vars, $vars2);
                }
                $prefs[$name] = 
$GLOBALS['phpgw']->preferences->lang_notify($prefs[$name],$vars);