diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-01-18 10:40:17 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-01-18 10:40:17 +0000 |
| commit | 0c125826a2252a14209648e384d2f5213d664b85 (patch) | |
| tree | a9c8749eafae0e601367ef0d0cf744bd2ed57922 | |
| parent | b23ef8283cd614ce4b36c30c353a7627438953e7 (diff) | |
- Fix removal of <title> tag from HTML messages (#1486432)
git-svn-id: https://svn.roundcube.net/trunk@3209 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 3983e243d..154332b59 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix removal of <title> tag from HTML messages (#1486432) - Fix 'force_https' to specified port when URL contains a port number (#1486411) - Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486422) - Bug in spellchecker suggestions when server charset != UTF8 (#1486406) diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 52b371999..98653087f 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -679,7 +679,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) // special replacements (not properly handled by washtml class) $html_search = array( '/(<\/nobr>)(\s+)(<nobr>)/i', // space(s) between <NOBR> - '/<title>.*<\/title>/i', // PHP bug #32547 workaround: remove title tag + '/<title[^>]*>.*<\/title>/i', // PHP bug #32547 workaround: remove title tag '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/', // byte-order mark (only outlook?) '/<html\s[^>]+>/i', // washtml/DOMDocument cannot handle xml namespaces ); |