diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-10-16 16:25:10 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-10-16 16:25:10 +0000 |
| commit | c79a82135a4733ca6f352ecf07d77202dc9d831c (patch) | |
| tree | b2149ea3cbf8c21ccc4e72fd3420ab8c88b49fcb /roundcubemail/program/steps/mail | |
| parent | b23e201482c7f0e02845e5fe470777eb330fa100 (diff) | |
- fix regular expression for malformed tags handler
git-svn-id: https://svn.roundcube.net/trunk@3046 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 0a8664cde..445b89d94 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -697,7 +697,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) $html = preg_replace($html_search, $html_replace, $html); // fix (unknown/malformed) HTML tags before "wash" - $html = preg_replace_callback('/(<[\/!]*)([^ >]+)/', 'rcmail_html_tag_callback', $html); + $html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', 'rcmail_html_tag_callback', $html); // charset was converted to UTF-8 in rcube_imap::get_message_part(), // -> change charset specification in HTML accordingly @@ -908,10 +908,6 @@ function rcmail_html_tag_callback($matches) { $tagname = $matches[2]; - // html comments (#1486189) - if ($matches[1] == '<!') - return '<!'; - $tagname = preg_replace(array( '/:.*$/', // Microsoft's Smart Tags <st1:xxxx> '/[^a-z0-9_-]/i', // forbidden characters |