From 534e45296e926da566cd609f01d7bad564b982a5 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 05 May 2014 03:47:07 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

---
 install/install.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/install/install.php b/install/install.php
index 847c2fd..796b027 100644
--- a/install/install.php
+++ b/install/install.php
@@ -191,7 +191,9 @@
 	$inst->configure_postfix();
 
 	//* Configure Mailman
-	$inst->configure_mailman('install');
+	if($conf['mailman']['installed'] == true) {
+		$inst->configure_mailman('install');
+	}
 
 	//* Configure jailkit
 	swriteln('Configuring Jailkit');

--
Gitblit v1.9.1