summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-10-16 16:25:10 +0000
committeralecpl <alec@alec.pl>2009-10-16 16:25:10 +0000
commitb6673c4e416affcfe644473cb8fc6009d04ee971 (patch)
tree37fb11fbe1b706682d02be7fa5c56b6b1275e050 /program
parent4385ad90999a1adcf8ef6f5aea46b6ea758700dc (diff)
- fix regular expression for malformed tags handler
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/func.inc6
1 files changed, 1 insertions, 5 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 0a8664cde..445b89d94 100644
--- a/program/steps/mail/func.inc
+++ b/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