From 7f81430745795fa166327c5da7543f335b2f5231 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Thu, 08 May 2014 12:41:51 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
install/update.php | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/install/update.php b/install/update.php
index 5cc2f42..6a1b9d1 100644
--- a/install/update.php
+++ b/install/update.php
@@ -66,6 +66,9 @@
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
+//** Include the templating lib
+require_once 'lib/classes/tpl.inc.php';
+
//** Check for ISPConfig 2.x versions
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
die('This software cannot be installed on a server wich runs ISPConfig 2.x.');
@@ -259,8 +262,10 @@
$inst->configure_postfix('dont-create-certs');
//** Configure mailman
- swriteln('Configuring Mailman');
- $inst->configure_mailman('update');
+ if($conf['mailman']['installed'] == true) {
+ swriteln('Configuring Mailman');
+ $inst->configure_mailman('update');
+ }
//* Configure Jailkit
swriteln('Configuring Jailkit');
--
Gitblit v1.9.1