From c3570e5419af1f86a1662239674087988eb737c4 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 03 Jan 2014 09:27:11 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
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