diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index 2f5c08d0ab0a4176358b661e098e0cce3c9d730c..03a45f18060db0233fed9e3c804c7e9df0558739 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -131,7 +131,7 @@ class tform { $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 @@ class tform { } 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 index 5a388445c4e6437ce4fdf4dbec3e085a63d8b3de..b3c0ac5db8fc183297be9ec186f9c516020b2b90 100644 --- a/interface/web/client/client_edit.php +++ b/interface/web/client/client_edit.php @@ -212,9 +212,6 @@ class page_action extends tform_actions { } } - $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 index 606e7b1e1d37c4fe680e6058fca9073cfcccc209..f9828569a6d257bc2b6fb48112261af623058b9f 100644 --- a/interface/web/client/reseller_edit.php +++ b/interface/web/client/reseller_edit.php @@ -159,9 +159,6 @@ class page_action extends tform_actions { } } - $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 index 2c0bb605d6c8ef694622570345530f8c3b13154c..ccb356c26842a3dc86c2faecaefcc99d3938979d 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -471,9 +471,6 @@ class page_action extends tform_actions { } } - $app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt')); - $app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt')); - parent::onShowEnd(); }