From 49441bdd0f3ff75d5092d5b832b97ea722a66363 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Fri, 01 Jul 2016 03:53:30 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- server/plugins-available/maildrop_plugin.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php index 1ebb677..2fefa26 100644 --- a/server/plugins-available/maildrop_plugin.inc.php +++ b/server/plugins-available/maildrop_plugin.inc.php @@ -211,7 +211,7 @@ $mailfilter_content .= file_get_contents($conf["rootpath"].'/conf/mailfilter_move_junk.master')."\n"; } } - $mailfilter_content .= $data["new"]["custom_mailfilter"]; + $mailfilter_content .= str_replace("\r\n","\n",$data["new"]["custom_mailfilter"]); // Replace windows linebreaks in mailfilter file $mailfilter_content = str_replace("\r\n", "\n", $mailfilter_content); -- Gitblit v1.9.1