Ticket #31093: trac_31093_has_shortcode_array_support.diff

wp-includes/shortcodes.php

@@ -141 +141 @@
 }
 
 /**
- * Whether the passed content contains the specified shortcode
+ * Whether the passed content contains any or specified shortcode
+ * Can accept an array of shortcode tags
  *
  * @since 3.6.0
  *
  * @global array $shortcode_tags
  *
  * @param string $content Content to search for shortcodes.
- * @param string $tag     Shortcode tag to check.
+ * @param array | string $tag Optional. Shortcode tag to check.
+ * @param string When multiple shortcode tags are passed, comparison operator for final result.
  * @return bool Whether the passed content contains the given shortcode.
  */
-function has_shortcode( $content, $tag ) {
+function has_shortcode( $content, $tag = '', $tag_relation = 'OR' ) {
         if ( false === strpos( $content, '[' ) ) {
                 return false;
         }
 
-        if ( shortcode_exists( $tag ) ) {
-                preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-                if ( empty( $matches ) )
-                        return false;
+        preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
+        if ( empty( $matches ) )
+                return false;
+
+        if ( empty( $tag ) ) {
+                return true;
+        }
+
+        if ( is_array( $tag ) ) {
+                $tag_relation = strtoupper( $tag_relation );
+
+                if ( $tag_relation == 'OR' ) {
+                        // Return true as soon as the first shortcode tag is found
+                        foreach ( $tag as $stag ) {
+                                foreach ( $matches as $shortcode ) {
+                                        if ( $stag === $shortcode[2] ) {
+                                                return true;
+                                        } elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $stag ) ) {
+                                                return true;
+                                        }
+                                }
+                        }
+                } else if ( $tag_relation == 'AND' ) {
+                        // Collect existence of all shortcode tags
+                        $found_shortcode = array();
+                        foreach ( $tag as $stag ) {
+                                $found_shortcode[ $stag ] = false;
+                                foreach ( $matches as $shortcode ) {
+                                        if ( $stag === $shortcode[2] ) {
+                                                $found_shortcode[ $stag ] = true;
+                                        } elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $stag ) ) {
+                                                $found_shortcode[ $stag ] = true;
+                                        }
+                                }
+                        }
 
+                        // return true if all are true, else false
+                        return count( array_unique( $found_shortcode ) ) == 1 && current( $found_shortcode );
+                }
+        } else {
                 foreach ( $matches as $shortcode ) {
                         if ( $tag === $shortcode[2] ) {
                                 return true;
@@ -169 +206 @@
                         }
                 }
         }
+
         return false;
 }