- Trim HTML message before washing, to make sure that BOM is removed even when prepended by some whitespace chars (#1487915)

13 years ago · 21461dce77
parent e4d0947550
commit 21461dce77
1 changed files with 1 additions and 1 deletions
--- 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) {