From 53f4a0b4229550275451cc9bc687c60b5f7391ea Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 03 Jan 2014 07:22:23 -0500
Subject: [PATCH] Merge remote-tracking branch 'schoene/master'
---
install/update.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/install/update.php b/install/update.php
index 2788998..249c67f 100644
--- a/install/update.php
+++ b/install/update.php
@@ -289,8 +289,10 @@
$inst->configure_spamassassin();
//** Configure Amavis
- swriteln('Configuring Amavisd');
- $inst->configure_amavis();
+ if($conf['amavis']['installed'] == true) {
+ swriteln('Configuring Amavisd');
+ $inst->configure_amavis();
+ }
//** Configure Getmail
swriteln('Configuring Getmail');
--
Gitblit v1.9.1