Ticket #34092: 34092.diff

src/wp-includes/shortcodes.php

@@ -305 +305 @@
 
         if ( isset( $m[5] ) ) {
                 // enclosing tag - extra parameter
-                return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6];
+                $encl = shortcode_parse_enclosures( $m[5], $tag );
+                $content = array_shift( $encl );
+                $attr = array_merge( $attr, $encl );
         } else {
                 // self-closing tag
-                return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, null,  $tag ) . $m[6];
+                $content = null;
         }
+
+        return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $content, $tag ) . $m[6];
 }
 
 /**
@@ -478 +482 @@
 }
 
 /**
+ * Split up multiple enclosures into a list of attributes.
+ *
+ * @since 4.4.0
+ *
+ * @param string $input The enclosed content, including any attribute delimiters.
+ * @param string $tag The name of the parent shortcode.
+ * @return array List of attributes and their value, where the first item is the primary content.
+ */
+function shortcode_parse_enclosures( $input, $tag ) {
+        $tag = preg_quote( $tag );
+
+        // Regex group arranged so that we split on the delimeters, but then only capture the name portion. :)
+        $textarr = preg_split( "/\[$tag:([^=]*)=\]/", $input, -1, PREG_SPLIT_DELIM_CAPTURE );
+        
+        // Check for multiple enclosures.
+        $c = count( $textarr );
+        if ( 1 == $c ) {
+                return $textarr;
+        }
+        
+        // List multiple enclosures, starting with the primary content.
+        $encl = array( $textarr[0] );
+        for ( $i = 1; $i < $c; $i += 2 ) {
+                // Now $i is the name's index and $i+1 is the value's index.
+                if ( ! empty( $textarr[ $i ] ) ) {
+                        $encl[ strtolower( $textarr[ $i ] ) ] = $textarr[ $i + 1 ];
+                } else {
+                        $encl[] = $textarr[ $i + 1 ];
+                }
+        }
+        return $encl;
+}
+
+/**
  * Combine user attributes with known attributes and fill in defaults when needed.
  *
  * The pairs should be considered to be all of the attributes which are