From e644c029954cf6de4e9e9690da72b97a17ea1c85 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 03:20:42 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5
---
server/plugins-available/maildeliver_plugin.inc.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index e3799d7..c8fc069 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -130,6 +130,7 @@
$tpl->setLoop('ccloop', $tmp_addresses_arr);
// Custom filters
+ if($data["new"]["custom_mailfilter"] == 'NULL') $data["new"]["custom_mailfilter"] = '';
$tpl->setVar('custom_mailfilter', $data["new"]["custom_mailfilter"]);
// Move junk
--
Gitblit v1.9.1