From b052bca67ee1853215987f907fe1fc1a3d015f89 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 15 Oct 2019 19:36:02 +0000 Subject: [PATCH] Shortcodes: Revert [46369] for now to allow more time to investigate and prepare for backward compatibility changes. Also reverts follow-up changes in [46370] and [46465]. See #47863. Built from https://develop.svn.wordpress.org/trunk@46554 git-svn-id: http://core.svn.wordpress.org/trunk@46351 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/shortcodes.php | 11 ++--------- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php index 728ec26484..465293d9f9 100644 --- a/wp-includes/shortcodes.php +++ b/wp-includes/shortcodes.php @@ -488,9 +488,8 @@ function get_shortcode_atts_regex() { * retrieval of the attributes, since all attributes have to be known. * * @since 2.5.0 - * @since 5.3.0 Added support of a full shortcode input. * - * @param string $text Any single shortcode of any format or key/value pair string. + * @param string $text * @return array|string List of attribute values. * Returns empty array if trim( $text ) == '""'. * Returns empty string if trim( $text ) == ''. @@ -499,13 +498,7 @@ function get_shortcode_atts_regex() { function shortcode_parse_atts( $text ) { $atts = array(); $pattern = get_shortcode_atts_regex(); - $text = trim( preg_replace( "/[\x{00a0}\x{200b}]+/u", ' ', $text ) ); - - // Remove everything but attributes from shortcode. - if ( preg_match( '#^\[[\w-]+([^\]]*?)\/?\]#', $text, $matches ) ) { - $text = $matches[1]; - } - + $text = preg_replace( "/[\x{00a0}\x{200b}]+/u", ' ', $text ); if ( preg_match_all( $pattern, $text, $match, PREG_SET_ORDER ) ) { foreach ( $match as $m ) { if ( ! empty( $m[1] ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 6e3c8749d0..11c44c657a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3-beta3-46553'; +$wp_version = '5.3-beta3-46554'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.