From b3bb64c3d2de76da63b38fb0aa476e1d7ec65384 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 13 May 2014 12:00:53 -0500
Subject: [PATCH] html: Remove duplicate style properties
Also use single quotes instead of double quotes in style attributes which
do not require escaping to "
---
include/class.format.php | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/include/class.format.php b/include/class.format.php
index 14dd88c91..38aaec5c9 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -178,13 +178,25 @@ class Format {
// Clean browser-specific style attributes
if (isset($attributes['style'])) {
$styles = preg_split('/;\s*/S', html_entity_decode($attributes['style']));
+ $props = array();
foreach ($styles as $i=>&$s) {
@list($prop, $val) = explode(':', $s);
+ if (isset($props[$prop])) {
+ unset($styles[$i]);
+ continue;
+ }
+ $props[$prop] = true;
+ // Remove unset or browser-specific style rules
if (!$val || !$prop || $prop[0] == '-' || substr($prop, 0, 4) == 'mso-')
unset($styles[$i]);
+ // Remove quotes of properties without enclosed space
if (!strpos($val, ' '))
- $s = str_replace('"','', $s);
+ $val = str_replace('"','', $val);
+ else
+ $val = str_replace('"',"'", $val);
+ $s = "$prop:".trim($val);
}
+ unset($s);
if ($styles)
$attributes['style'] = Format::htmlencode(implode(';', $styles));
else
--
GitLab