From ffedcb9a80e8a3ff375993fc349d9ce969a1a4d7 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 16 Jun 2016 10:41:37 -0400
Subject: [PATCH] First part of fix for issue #3896 - Unknown column 'default_mailserver' in 'field list' when saving client limits main template
---
server/plugins-available/apache2_plugin.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 6763399..021078d 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1494,7 +1494,7 @@
if (count($rewrite_wildcard_rules) > 0) $rewrite_rules = array_merge($rewrite_rules, $rewrite_wildcard_rules); // Append wildcard rules to the end of rules
- if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0 || count($alias_seo_redirects) > 0) {
+ if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0 || count($alias_seo_redirects) > 0 || $data['new']['rewrite_to_https'] == 'y') {
$tpl->setVar('rewrite_enabled', 1);
} else {
$tpl->setVar('rewrite_enabled', 0);
--
Gitblit v1.9.1