From f1634087ea8a852b58ec13d5099e94771ed80849 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 12 May 2014 08:47:22 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/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 35a8ca7..a7938b4 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