diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-05-16 07:13:01 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-05-16 07:13:01 +0000 |
| commit | 883448243f446c25a06dd793cc72356e01a972a0 (patch) | |
| tree | 30bc3c9bcf2c009d5c1885a98b80dc153db98943 /roundcubemail/program/steps/mail/func.inc | |
| parent | fdf405effa6a7a75361ee976c1f73c03749b7e3f (diff) | |
- Trim HTML message before washing, to make sure that BOM is removed even when prepended by some whitespace chars (#1487915)
git-svn-id: https://svn.roundcube.net/trunk@4772 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/func.inc')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index cfdad791a..36b4c02a6 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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) { |