Ticket #31093: 31093.5.diff

src/wp-includes/shortcodes.php

@@ -127 +127 @@
 }
 
 /**
- * Whether the passed content contains the specified shortcode
+ * Whether the passed content contains any or specified shortcode.
  *
  * @since 3.6.0
  *
  * @global array $shortcode_tags
  *
  * @param string $content Content to search for shortcodes.
- * @param string $tag     Shortcode tag to check.
- * @return bool Whether the passed content contains the given shortcode.
+ * @param string $tag     Shortcode tag to check. Default Empty string.
+ * @return bool  $return  Whether the passed content contains any or specified shortcode.
  */
-function has_shortcode( $content, $tag ) {
+function has_shortcode( $content, $tag = '' ) {
         if ( false === strpos( $content, '[' ) ) {
                 return false;
         }
+        
+        if ( empty( $tag ) ) {
+                return strip_shortcodes( $content ) !== $content;
+        }
 
         if ( shortcode_exists( $tag ) ) {
                 preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );

tests/phpunit/tests/shortcode.php

@@ -582 +582 @@
         }
 
         /**
+         * Tests if has_shortcode() finds any shortcode, when tag input is empty
+         *
+         * @ticket 31093
+         */
+        public function test_has_shortcode_should_find_any_shortcode_with_empty_tag_input() {
+                $content = 'This is a blob with [gallery] in it';
+                $this->assertTrue( has_shortcode( $content ) );
+
+                $content = 'This is a blob without a shortcode in it';
+                $this->assertFalse( has_shortcode( $content ) );
+
+                $content = 'This is a blob with an [foo] non-existing shortcode in it';
+                $this->assertFalse( has_shortcode( $content ) );
+
+                $content_nested = 'This is a blob with [foo] [gallery] [/foo] in it';
+                $this->assertTrue( has_shortcode( $content_nested ) );
+
+                add_shortcode( 'foo', '__return_empty_string' );
+                $content = 'This is a blob with a [foo] shortcode in it';
+                $this->assertTrue( has_shortcode( $content ) );
+                remove_shortcode( 'foo' );
+        }
+        
+        /**
          * Make sure invalid shortcode names are not allowed.
          *
          * @dataProvider data_registration_bad