Commit 82e2a20f authored by Marius Cramer's avatar Marius Cramer
Browse files

Fixed bug in language include

Removed workarounds
parent 14fe6d43
......@@ -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);
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment