From 7b35164b46ca67cd1dfa43bba583aa90106a5d8b Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 Nov 2013 08:57:42 -0500
Subject: [PATCH] Reverted array_merge change
---
interface/lib/classes/tform.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 03a45f1..68d5910 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -146,7 +146,7 @@
}
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);
--
Gitblit v1.9.1