From 0bc228446c1f680f14aff72dbfd85dc5edd0043e Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 12 Jul 2013 09:59:37 -0400
Subject: [PATCH] - Changed installer template handling   It is now possible to put a customized copy of each .master template file into   /usr/local/ispconfig/server/conf-custom/install/   to keep manual changes done in this file.   If existing, these .master files are used on ISPConfig upgrade instead of the provided installer templates.

---
 interface/web/mail/mail_user_edit.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index b80e3ee..ca973c5 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -117,6 +117,12 @@
 			$app->tpl->setVar("ar_active", '');
 		}
 		
+		if($this->dataRecord['autoresponder_subject'] == '') {
+			$app->tpl->setVar('autoresponder_subject', $app->tform->lng('autoresponder_subject'));
+		} else {
+			$app->tpl->setVar('autoresponder_subject', $this->dataRecord['autoresponder_subject']);
+		}
+		
     $app->uses('getconf');
     $mail_config = $app->getconf->get_global_config('mail');
 		if($mail_config["enable_custom_login"] == "y") {

--
Gitblit v1.9.1