Changeset 46554 for trunk/src/wp-includes/shortcodes.php

Timestamp:

10/15/2019 07:34:31 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-includes/shortcodes.php (modified) (2 diffs)

trunk/src/wp-includes/shortcodes.php

@@ -489 +489 @@
  *
  * @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 ) == '""'.
@@ -500 +499 @@
     $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 ) {