From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.
---
server/plugins-available/mailman_plugin.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php
index ac36070..5a4593a 100644
--- a/server/plugins-available/mailman_plugin.inc.php
+++ b/server/plugins-available/mailman_plugin.inc.php
@@ -113,7 +113,7 @@
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
// load files
- if(file_exists($conf["rootpath"]."/conf/mm_cfg.py.master")) {
+ if(file_exists($conf["rootpath"]."/conf-custom/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");
--
Gitblit v1.9.1