From 6e6b81a7f9a8e6b5f308cb841d4b38fc0605991b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 23 Jan 2012 09:44:27 -0500
Subject: [PATCH] Fixed: FS#1994 - ISPConfig webportal resets mailman default settings
---
server/plugins-available/mailman_plugin.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php
index fd2fa7a..ac36070 100644
--- a/server/plugins-available/mailman_plugin.inc.php
+++ b/server/plugins-available/mailman_plugin.inc.php
@@ -113,7 +113,11 @@
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
// load files
- $content = file_get_contents($conf["rootpath"]."/conf/mm_cfg.py.master");
+ if(file_exists($conf["rootpath"]."/conf/mm_cfg.py.master")) {
+ $content = file_get_contents($conf["rootpath"]."/conf-custom/mm_cfg.py.master");
+ } else {
+ $content = file_get_contents($conf["rootpath"]."/conf/mm_cfg.py.master");
+ }
$old_file = file_get_contents($this->mailman_config_dir."/mm_cfg.py");
$old_options = array();
--
Gitblit v1.9.1