From 855e605f5e20bb5065b089d6af6468a56032475c Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Thu, 21 Nov 2013 09:28:13 -0500
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/web/client/client_edit.php | 3 ---
interface/web/client/reseller_edit.php | 3 ---
interface/lib/classes/tform.inc.php | 2 +-
interface/web/sites/web_domain_edit.php | 3 ---
4 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 2f5c08d..68d5910 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;
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 5a38844..b3c0ac5 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -212,9 +212,6 @@
}
}
- $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 606e7b1..f982856 100644
--- a/interface/web/client/reseller_edit.php
+++ b/interface/web/client/reseller_edit.php
@@ -159,9 +159,6 @@
}
}
- $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 2c0bb60..ccb356c 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -471,9 +471,6 @@
}
}
- $app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));
- $app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));
-
parent::onShowEnd();
}
--
Gitblit v1.9.1