summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-02-28 08:07:45 +0000
committeralecpl <alec@alec.pl>2010-02-28 08:07:45 +0000
commita72ad657241fd35ae7e0f2cbdec210caa9554695 (patch)
tree6427f18311bf2379119367c8efcbf174b838c28f
parent72b140dc9804f159c2bee65832bbe105db329c5d (diff)
- Fix invalid font tags which cause HTML message rendering problems (#1486521)
-rw-r--r--CHANGELOG1
-rw-r--r--program/lib/washtml.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1093b0746..c7627e6a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix invalid font tags which cause HTML message rendering problems (#1486521)
- Fix CVE-2010-0464: Disable DNS prefetching (#1486449)
- Fix Received headers to behave better with SpamAssassin (#1486513)
- Password: Make passwords encoding consistent with core, add 'password_charset' global option (#1486473)
diff --git a/program/lib/washtml.php b/program/lib/washtml.php
index fb2533b4a..2acb7529f 100644
--- a/program/lib/washtml.php
+++ b/program/lib/washtml.php
@@ -87,7 +87,7 @@ class washtml
static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height', 'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing', 'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight', 'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border', 'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace', 'cellborder', 'size', 'lang', 'dir');
/* Block elements which could be empty but cannot be returned in short form (<tag />) */
- static $block_elements = array('div', 'p', 'pre', 'blockquote', 'a');
+ static $block_elements = array('div', 'p', 'pre', 'blockquote', 'a', 'font');
/* State for linked objects in HTML */
public $extlinks = false;