Changeset 42861

Timestamp:

03/20/2018 09:36:04 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Formatting: Avoid a PHP 7.2 warning in wp_kses_attr() when one of $allowedtags elements is an uncountable value.

Props andrei0x309, soulseekah, SergeyBiryukov.
Merges [42860] to the 4.9 branch.
Fixes #43312.

Location:

branches/4.9

Files:

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

branches/4.9/src/wp-includes/kses.php

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

branches/4.9/tests/phpunit/tests/kses.php

@@ -709 +709 @@
                 $this->assertEquals( "<{$element} title=\"foo\">", wp_kses_attr( $element, $attribute, array( 'foo' => array( 'title' => true ) ), array() ) );
         }
+
+        /**
+         * @ticket 43312
+         */
+        function test_wp_kses_attr_no_attributes_allowed_with_false() {
+                $element   = 'foo';
+                $attribute = 'title="foo" class="bar"';
+
+                $this->assertEquals( "<{$element}>", wp_kses_attr( $element, $attribute, array( 'foo' => false ), array() ) );
+        }
 }