Fixed bug in language include

Marius Cramer · Marius Cramer · commit 82e2a20fdc6f · 2013-11-21T14:56:50.000+01:00
Removed workarounds
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
@@ -131,7 +131,7 @@ function loadFormDef($file, $module = '') {
 		$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 @@ function loadFormDef($file, $module = '') {
 		}
 
 		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);
 
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
@@ -212,9 +212,6 @@ function onShowEnd() {
 			}
 		}
 		
-		$app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));
-		$app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));
-
 		parent::onShowEnd();
 
 	}
diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php
@@ -159,9 +159,6 @@ function onShowEnd() {
 			}
 		}
 		
-		$app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));
-		$app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));
-
 		parent::onShowEnd();
 
 	}
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
@@ -471,9 +471,6 @@ function onShowEnd() {
 			}
 		}
 
-		$app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));
-		$app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));
-		
 		parent::onShowEnd();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ function loadFormDef($file, $module = '') {`
`131`	`131`	`$this->module = $module;`
`132`	`132`	`$wb = array();`
`133`	`133`
`134`		`- include_once ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng';`
	`134`	`+ include ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng';`
`135`	`135`
`136`	`136`	`if(is_array($wb)) $wb_global = $wb;`
`137`	`137`
`@@ -146,7 +146,7 @@ function loadFormDef($file, $module = '') {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if(is_array($wb_global)) {`
`149`		`- $wb = $app->functions->array_merge($wb_global, $wb);`
	`149`	`+ $wb = array_merge($wb_global, $wb);`
`150`	`150`	`}`
`151`	`151`	`if(isset($wb_global)) unset($wb_global);`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,6 @@ function onShowEnd() {`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`- $app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));`
`216`		`- $app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));`
`217`		`-`
`218`	`215`	`parent::onShowEnd();`
`219`	`216`
`220`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,6 @@ function onShowEnd() {`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`- $app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));`
`163`		`- $app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));`
`164`		`-`
`165`	`162`	`parent::onShowEnd();`
`166`	`163`
`167`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -471,9 +471,6 @@ function onShowEnd() {`
`471`	`471`	`}`
`472`	`472`	`}`
`473`	`473`
`474`		`- $app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));`
`475`		`- $app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));`
`476`		`-`
`477`	`474`	`parent::onShowEnd();`
`478`	`475`	`}`
`479`	`476`