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

SergeyBiryukov · SergeyBiryukov · commit 342cac1a88f1 · 2018-03-20T21:36:04.000Z
Props andrei0x309, soulseekah, SergeyBiryukov. Merges [42860] to the 4.9 branch. Fixes #43312. git-svn-id: https://develop.svn.wordpress.org/branches/4.9@42861 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/kses.php b/src/wp-includes/kses.php
@@ -827,7 +827,8 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
 		$xhtml_slash = ' /';
 
 	// 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>";
 	}
 
diff --git a/tests/phpunit/tests/kses.php b/tests/phpunit/tests/kses.php
@@ -708,4 +708,14 @@ function test_wp_kses_attr_single_attribute_is_allowed() {
 
 		$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() ) );
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -827,7 +827,8 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {`
`827`	`827`	`$xhtml_slash = ' /';`
`828`	`828`
`829`	`829`	`// Are any attributes allowed at all for this element?`
`830`		`- if ( ! isset( $allowed_html[ strtolower( $element ) ] ) \|\| true === $allowed_html[ strtolower( $element ) ] \|\| count( $allowed_html[ strtolower( $element ) ] ) == 0 ) {`
	`830`	`+ $element_low = strtolower( $element );`
	`831`	`+ if ( empty( $allowed_html[ $element_low ] ) \|\| true === $allowed_html[ $element_low ] ) {`
`831`	`832`	`return "<$element$xhtml_slash>";`
`832`	`833`	`}`
`833`	`834`
Original file line number	Diff line number	Diff line change
`@@ -708,4 +708,14 @@ function test_wp_kses_attr_single_attribute_is_allowed() {`
`708`	`708`
`709`	`709`	`$this->assertEquals( "<{$element} title=\"foo\">", wp_kses_attr( $element, $attribute, array( 'foo' => array( 'title' => true ) ), array() ) );`
`710`	`710`	`}`
	`711`	`+`
	`712`	`+ /**`
	`713`	`+ * @ticket 43312`
	`714`	`+ */`
	`715`	`+ function test_wp_kses_attr_no_attributes_allowed_with_false() {`
	`716`	`+ $element = 'foo';`
	`717`	`+ $attribute = 'title="foo" class="bar"';`
	`718`	`+`
	`719`	`+ $this->assertEquals( "<{$element}>", wp_kses_attr( $element, $attribute, array( 'foo' => false ), array() ) );`
	`720`	`+ }`
`711`	`721`	`}`