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/autoupdate.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/install/autoupdate.php b/install/autoupdate.php
index 5913974..e343d84 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -198,8 +198,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