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'
---
server/plugins-available/getmail_plugin.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index 80424ad..5b1edfb 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -100,7 +100,11 @@
if($data["new"]["active"] == 'y') {
// Open master template
- $tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
+ if(file_exists($conf["rootpath"].'/conf-custom/getmail.conf.master')) {
+ $tpl = file_get_contents($conf["rootpath"].'/conf-custom/getmail.conf.master');
+ } else {
+ $tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
+ }
// Shall emails be deleted after retrieval
if($data["new"]["source_delete"] == 'y') {
--
Gitblit v1.9.1