From 7972151d0448b99e0ba28c819a698757c27c1d55 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Oct 2014 13:13:09 -0400
Subject: [PATCH] Merge branch '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 f4d8194..6e591a6 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -131,6 +131,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