From 8a701e5b3f0b126b536c89330bab8ffd1a653ced Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 20 Mar 2018 21:35:31 +0000 Subject: [PATCH] Formatting: Avoid a PHP 7.2 warning in `wp_kses_attr()` when one of `$allowedtags` elements is an uncountable value. Props andrei0x309, soulseekah, SergeyBiryukov. Fixes #43312. Built from https://develop.svn.wordpress.org/trunk@42860 git-svn-id: http://core.svn.wordpress.org/trunk@42690 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/kses.php | 3 ++- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/kses.php b/wp-includes/kses.php index 93fc9dd00b..265fb748ac 100644 --- a/wp-includes/kses.php +++ b/wp-includes/kses.php @@ -1047,7 +1047,8 @@ function wp_kses_attr( $element, $attr, $allowed_html, $allowed_protocols ) { } // 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/wp-includes/version.php b/wp-includes/version.php index 2a7ce8cdbe..5900ba5af4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42858'; +$wp_version = '5.0-alpha-42860'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.