Changeset 40637

Timestamp:

05/11/2017 07:22:17 PM (7 years ago)

Author:

ocean90

Message:

KSES: Support 'tag' => true as a shorthand for 'tag' => array() in wp_kses_attr().

Automatic_Upgrader_Skin::feedback() had always assumed that this is already the case, now it is.

See #20017.
Fixes #40680.

Location:

trunk

Files:

• src/wp-includes/kses.php (modified) (1 diff)
• tests/phpunit/tests/kses.php (modified) (1 diff)

trunk/src/wp-includes/kses.php

@@ -829 +829 @@
 
     // Are any attributes allowed at all for this element?
-    if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 )
+    if ( ! isset( $allowed_html[ strtolower( $element ) ] ) || true === $allowed_html[ strtolower( $element ) ] || count( $allowed_html[ strtolower( $element ) ] ) == 0 ) {
         return "<$element$xhtml_slash>";
+    }
 
     // Split it

trunk/tests/phpunit/tests/kses.php

@@ -679 +679 @@
         $this->assertEquals( $input, wp_kses( $input, $allowedposttags ) );
     }
+
+    /**
+     * @ticket 40680
+     */
+    function test_wp_kses_attr_no_attributes_allowed_with_empty_array() {
+        $element = 'foo';
+        $attribute = 'title="foo" class="bar"';
+
+        $this->assertEquals( "<{$element}>", wp_kses_attr( $element, $attribute, array( 'foo' => array() ), array() ) );
+    }
+
+    /**
+     * @ticket 40680
+     */
+    function test_wp_kses_attr_no_attributes_allowed_with_true() {
+        $element = 'foo';
+        $attribute = 'title="foo" class="bar"';
+
+        $this->assertEquals( "<{$element}>", wp_kses_attr( $element, $attribute, array( 'foo' => true ), array() ) );
+    }
+
+    /**
+     * @ticket 40680
+     */
+    function test_wp_kses_attr_single_attribute_is_allowed() {
+        $element = 'foo';
+        $attribute = 'title="foo" class="bar"';
+
+        $this->assertEquals( "<{$element} title=\"foo\">", wp_kses_attr( $element, $attribute, array( 'foo' => array( 'title' => true ) ), array() ) );
+    }
 }