Changeset 29197

Timestamp:

07/16/2014 10:04:08 PM (10 years ago)

Author:

wonderboymusic

Message:

Make has_shortcode() recursive/work for nested shortcodes.

Adds unit test.

Props katzwebdesign.
Fixes #26343.

Location:

trunk

Files:

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

trunk/src/wp-includes/shortcodes.php

@@ -166 +166 @@
 
         foreach ( $matches as $shortcode ) {
-            if ( $tag === $shortcode[2] )
+            if ( $tag === $shortcode[2] ) {
                 return true;
+            } elseif ( isset( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
+                return has_shortcode( $shortcode[5], $tag );
+            }
         }
     }

trunk/tests/phpunit/tests/shortcode.php

@@ -395 +395 @@
         }
     }
+
+    /**
+     * @ticket 26343
+     */
+    function test_has_shortcode() {
+        $content = 'This is a blob with [gallery] in it';
+        $this->assertTrue( has_shortcode( $content, 'gallery' ) );
+
+        add_shortcode( 'foo', '__return_false' );
+        $content_nested = 'This is a blob with [foo] [gallery] [/foo] in it';
+        $this->assertTrue( has_shortcode( $content_nested, 'gallery' ) );
+        remove_shortcode( 'foo' );
+    }
 }