WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Take first attribute and ignore later duplicate attributes. Fixes #6602 for trunk. Props schiller. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-07-21 01:12:49 +00:00
parent eb1f1ece79
commit 6c31b19627
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-includes/kses.php
View File

@ -537,7 +537,8 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
* input. It will add quotes around attribute values that don't have any quotes * 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 * 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 * 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 * @since 1.0.0
* *
@ -580,7 +581,9 @@ function wp_kses_hair($attr, $allowed_protocols) {
{ {
$working = 1; $working = 1;
$mode = 0; $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); $attr = preg_replace('/^\s+/', '', $attr);
} }
@ -593,7 +596,9 @@ function wp_kses_hair($attr, $allowed_protocols) {
{ {
$thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); $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; $working = 1;
$mode = 0; $mode = 0;
$attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr); $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
@ -605,7 +610,9 @@ function wp_kses_hair($attr, $allowed_protocols) {
{ {
$thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); $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; $working = 1;
$mode = 0; $mode = 0;
$attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr); $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
@ -617,7 +624,9 @@ function wp_kses_hair($attr, $allowed_protocols) {
{ {
$thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); $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. # We add quotes to conform to W3C's HTML spec.
$working = 1; $working = 1;
$mode = 0; $mode = 0;
@ -634,10 +643,10 @@ function wp_kses_hair($attr, $allowed_protocols) {
} }
} # while } # while
if ($mode == 1) if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
# special case, for when the attribute list ends with a valueless # special case, for when the attribute list ends with a valueless
# attribute like "selected" # attribute like "selected"
$attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
return $attrarr; return $attrarr;
} }