From 1292ee01519304c939c3528ed211bef5e1e55186 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 16 Jul 2014 22:05:17 +0000
Subject: [PATCH] Make `has_shortcode()` recursive/work for nested shortcodes.

Adds unit test.

Props katzwebdesign.
Fixes #26343.

Built from https://develop.svn.wordpress.org/trunk@29197


git-svn-id: http://core.svn.wordpress.org/trunk@28981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/shortcodes.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 47cb57a9b2..fc850460f2 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -165,8 +165,11 @@ function has_shortcode( $content, $tag ) {
 			return false;
 
 		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 );
+			}
 		}
 	}
 	return false;