Changeset 33594

Timestamp:

08/07/2015 02:49:31 AM (11 years ago)

Author:

dd32

Message:

Fix do_shortcode('<[shortcode]') edge case.
Props miqrogroove.
Merges [33499] trunk.
See #33116.

Location:

trunk

Files:

• src/wp-includes/shortcodes.php (modified) (1 diff)
• tests/phpunit/tests/shortcode.php (modified) (2 diffs)

trunk/src/wp-includes/shortcodes.php

@@ -360 +360 @@
                 $attributes = wp_kses_attr_parse( $element );
                 if ( false === $attributes ) {
+                        // Some plugins are doing things like [name] <[email]>.
+                        if ( 1 === preg_match( '%^<\s*\[\[?[^\[\]]+\]%', $element ) ) {
+                                $element = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $element );
+                        }
+
                         // Looks like we found some crazy unfiltered HTML.  Skipping it for sanity.
                         $element = strtr( $element, $trans );

trunk/tests/phpunit/tests/shortcode.php

@@ -436 +436 @@
                         ),
                         array(
+                                '<[[gallery]]>',
+                                '<[gallery]>',
+                        ),
+                        array(
+                                '<div style="background:url([[gallery]])">',
+                                '<div style="background:url([[gallery]])">',
+                        ),
+                        array(
                                 '[gallery]<div>Hello</div>[/gallery]',
                                 '',
@@ -472 +480 @@
                                 '<div [[gallery]]>', // Shortcodes will never be stripped inside elements.
                                 '<div [[gallery]]>',
+                        ),
+                        array(
+                                '<[[gallery]]>',
+                                '<[[gallery]]>',
                         ),
                         array(