Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-24 08:46:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

- fix regular expression for malformed tags handler

Browse Source
This commit is contained in:
alecpl
2009-10-16 16:25:10 +00:00
parent 4385ad9099
commit b6673c4e41
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
program/steps/mail/func.inc
View File

@@ -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