From b6673c4e416affcfe644473cb8fc6009d04ee971 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 16 Oct 2009 12:25:10 -0400
Subject: [PATCH] - fix regular expression for malformed tags handler
---
program/steps/mail/func.inc | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 0a8664c..445b89d 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -697,7 +697,7 @@
$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 @@
{
$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
--
Gitblit v1.9.1