From 96b679d10ddedf97c7a72724697edca2f5266179 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 18 Jan 2010 05:40:17 -0500
Subject: [PATCH] - Fix removal of <title> tag from HTML messages (#1486432)
---
CHANGELOG | 1 +
program/steps/mail/func.inc | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 3983e24..154332b 100644
--- a/CHANGELOG
+++ b/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/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 52b3719..9865308 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -679,7 +679,7 @@
// 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
);
--
Gitblit v1.9.1