Changeset 33568 for branches/3.7

Timestamp:

08/04/2015 07:18:50 AM (9 years ago)

Author:

dd32

Message:

Fix do_shortcode('<[shortcode]') edge case.
Props miqrogroove.

Merges [33499] to the 3.7 branch.
See #33116.

Location:

branches/3.7

Files:

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

branches/3.7/src/wp-includes/shortcodes.php

@@ -346 +346 @@
         $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 );

branches/3.7/tests/phpunit/tests/shortcode.php

@@ -406 +406 @@
             ),
             array(
+                '<[[gallery]]>',
+                '<[gallery]>',
+            ),
+            array(
+                '<div style="background:url([[gallery]])">',
+                '<div style="background:url([[gallery]])">',
+            ),
+            array(
                 '[gallery]<div>Hello</div>[/gallery]',
                 '',
@@ -444 +452 @@
             ),
             array(
+                '<[[gallery]]>',
+                '<[[gallery]]>',
+            ),
+            array(
                 '[gallery]<div>Hello</div>[/gallery]',
                 '',