diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-02-28 08:07:45 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-02-28 08:07:45 +0000 |
| commit | ff1dc41c6108ebf975d6a6996680b6560abf506d (patch) | |
| tree | 9c5a84a8e60002128dcf272d60c4cbab94c18983 | |
| parent | e44de9f794a500344da44b233489e22f0ed31259 (diff) | |
- Fix invalid font tags which cause HTML message rendering problems (#1486521)
git-svn-id: https://svn.roundcube.net/trunk@3295 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/lib/washtml.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 1093b0746..c7627e6a5 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/roundcubemail/program/lib/washtml.php b/roundcubemail/program/lib/washtml.php index fb2533b4a..2acb7529f 100644 --- a/roundcubemail/program/lib/washtml.php +++ b/roundcubemail/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; |