Ticket #31093: 31093.patch

src/wp-includes/shortcodes.php

@@ -173 +173 @@
 }
 
 /**
+ * Whether the passed content contains any shortcodes.
+ *
+ *
+ * @param string $content Content to remove shortcode tags.
+ * @return string Content without shortcode tags.
+ */
+function contains_shortcodes( $content ) {
+        $stripped_content = strip_shortcodes($content);
+        
+        if ( $content !== $stripped_content ) {
+            return true;
+        }
+        return false;
+}
+
+/**
  * Search content for shortcodes and filter shortcodes through their hooks.
  *
  * If there are no shortcode tags defined, then the content will be returned

tests/phpunit/tests/shortcode.php

@@ -397 +397 @@
                 $this->assertTrue( has_shortcode( $content_nested, 'gallery' ) );
                 remove_shortcode( 'foo' );
         }
+
+        /**
+         * @ticket 31093
+         */
+        function test_contains_shortcodes() {
+                $content = 'This is a blob with [gallery] in it';
+                $this->assertTrue( contains_shortcodes( $content ) );
+
+                $content_nested = 'This is a blob with [foo] [gallery] [/foo] in it';
+                $this->assertTrue( contains_shortcodes( $content_nested ) );
+
+                $content = 'This is a blob with no shortcodes in it';
+                $this->assertFalse( contains_shortcodes( $content ) );
+
+                $content = 'This is a blob with an [example] non-existing shortcode in it';
+                $this->assertFalse( contains_shortcodes( $content ) );
+        }
 }