summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-05-16 07:13:01 +0000
committeralecpl <alec@alec.pl>2011-05-16 07:13:01 +0000
commit21461dce77dd67a45a22e361dca4ecaf6c580788 (patch)
tree8d6adefb0e04b2d2d9fc5d4feb28f933105aa61d
parente4d094755086839f9400f36de5a15401460971b1 (diff)
- Trim HTML message before washing, to make sure that BOM is removed even when prepended by some whitespace chars (#1487915)
-rw-r--r--program/steps/mail/func.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index cfdad791a..36b4c02a6 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -575,7 +575,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces)
'',
'<html>',
);
- $html = preg_replace($html_search, $html_replace, $html);
+ $html = preg_replace($html_search, $html_replace, trim($html));
// PCRE errors handling (#1486856), should we use something like for every preg_* use?
if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {