From 6a1cf52045b9c65e5ec4f45d636a4d8c9e0488d9 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 13 Nov 2012 18:08:52 +0100 Subject: Fix handling of 'media' attribute on linked css (#1488789) Conflicts: CHANGELOG --- CHANGELOG | 1 + program/lib/washtml.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index fe7c5f6b2..5edf0d646 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix handling of 'media' attribute on linked css (#1488789) - Fix regression where unintentional page reload was done after request abort (#1488802) - Fix excessive LFs at the end of composed message with top_posting=true (#1488797) - Fix bug where leading blanks were stripped from quoted lines (#1488795) diff --git a/program/lib/washtml.php b/program/lib/washtml.php index d5cdb82f8..0d4ffdb4b 100644 --- a/program/lib/washtml.php +++ b/program/lib/washtml.php @@ -102,7 +102,7 @@ class washtml 'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight', 'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border', 'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace', - 'cellborder', 'size', 'lang', 'dir', 'usemap', 'shape', + 'cellborder', 'size', 'lang', 'dir', 'usemap', 'shape', 'media', // attributes of form elements 'type', 'rows', 'cols', 'disabled', 'readonly', 'checked', 'multiple', 'value' ); -- cgit v1.2.3