Ticket #6602: bug6602.patch

kses.php

@@ -531 +531 @@
  * input. It will add quotes around attribute values that don't have any quotes
  * or apostrophes around them, to make it easier to produce HTML code that will
  * conform to W3C's HTML specification. It will also remove bad URL protocols
- * from attribute values.
+ * from attribute values.  It also reduces duplicate attributes by using the
+ * attribute defined first (foo='bar' foo='baz' will result in foo='bar').
  *
  * @since 1.0.0
  *
@@ -574 +575 @@
                                         {
                                         $working = 1;
                                         $mode = 0;
-                                        $attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+                                        if(FALSE === array_key_exists($attrname, $attrarr)) {
+                                                $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+                                        }
                                         $attr = preg_replace('/^\s+/', '', $attr);
                                 }
 
@@ -587 +590 @@
                                         {
                                         $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
 
-                                        $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+                                        if(FALSE === array_key_exists($attrname, $attrarr)) {
+                                                $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+                                        }
                                         $working = 1;
                                         $mode = 0;
                                         $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
@@ -599 +604 @@
                                         {
                                         $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
 
-                                        $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
+                                        if(FALSE === array_key_exists($attrname, $attrarr)) {
+                                                $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
+                                        }
                                         $working = 1;
                                         $mode = 0;
                                         $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
@@ -611 +618 @@
                                         {
                                         $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
 
-                                        $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+                                        if(FALSE === array_key_exists($attrname, $attrarr)) {
+                                                $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+                                        }
                                         # We add quotes to conform to W3C's HTML spec.
                                         $working = 1;
                                         $mode = 0;
@@ -628 +637 @@
                 }
         } # while
 
-        if ($mode == 1)
+        if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr)) {
                 # special case, for when the attribute list ends with a valueless
                 # attribute like "selected"
-                $attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+                $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 
         return $attrarr;
 }