Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

Author: falkotimme

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;
 

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();
 
 	}

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();
 
 	}

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();
 	}