From 82e2a20fdc6ff2edbc935502ddadffab2b6c7ce9 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 Nov 2013 08:56:50 -0500
Subject: [PATCH] Fixed bug in language include Removed workarounds
---
interface/lib/classes/tform.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 2f5c08d..03a45f1 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -131,7 +131,7 @@
$this->module = $module;
$wb = array();
- include_once ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng';
+ include ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng';
if(is_array($wb)) $wb_global = $wb;
@@ -146,7 +146,7 @@
}
if(is_array($wb_global)) {
- $wb = $app->functions->array_merge($wb_global, $wb);
+ $wb = array_merge($wb_global, $wb);
}
if(isset($wb_global)) unset($wb_global);
--
Gitblit v1.9.1