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

Timestamp:

10/01/2019 03:41:58 AM (7 years ago)

Author:

whyisjake

Message:

Shortcodes: Improve handling from shortcode_parse_attts().

Ensure consistency between shortcode_parse_attts() when being used directly.

Props mauteri, birgire, SergeyBiryukov, kadamwhite, whyisjake.
Fixes #47863.

File:

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

trunk/src/wp-includes/shortcodes.php

@@ -489 +489 @@
  *
  * @since 2.5.0
- *
- * @param string $text
+ * @since 5.3.0 Support of a full shortcode input.
+ *
+ * @param string $text  Any single shortcode of any format or key/value pair string.
  * @return array|string List of attribute values.
  *                      Returns empty array if trim( $text ) == '""'.
@@ -499 +500 @@
         $atts    = array();
         $pattern = get_shortcode_atts_regex();
-        $text    = preg_replace( "/[\x{00a0}\x{200b}]+/u", ' ', $text );
+        $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];
+        }
+
         if ( preg_match_all( $pattern, $text, $match, PREG_SET_ORDER ) ) {
                 foreach ( $match as $m ) {
@@ -517 +524 @@
                 }
 
-                // Reject any unclosed HTML elements
+                // Reject any unclosed HTML elements.
                 foreach ( $atts as &$value ) {
                         if ( false !== strpos( $value, '<' ) ) {
@@ -528 +535 @@
                 $atts = ltrim( $text );
         }
+
         return $atts;
 }