Reverted array_merge change

Marius Cramer · Marius Cramer · commit 7b35164b46ca · 2013-11-21T14:57:42.000+01:00
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
@@ -146,7 +146,7 @@ function loadFormDef($file, $module = '') {
 		}
 
 		if(is_array($wb_global)) {
-			$wb = array_merge($wb_global, $wb);
+			$wb = $app->functions->array_merge($wb_global, $wb);
 		}
 		if(isset($wb_global)) unset($wb_global);
 

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ function loadFormDef($file, $module = '') {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if(is_array($wb_global)) {`
`149`		`- $wb = array_merge($wb_global, $wb);`
	`149`	`+ $wb = $app->functions->array_merge($wb_global, $wb);`
`150`	`150`	`}`
`151`	`151`	`if(isset($wb_global)) unset($wb_global);`
`152`	`152`