From 753a60c709bd747c07cb5f23feee019187336371 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Thu, 17 Jul 2014 17:37:51 +0000
Subject: [PATCH] After [29197], use `! empty()` instead of `isset()`. Don't
 call `has_shortcode()` internally twice if it's true.

Props kovshenin.
Fixes #26343.


git-svn-id: https://develop.svn.wordpress.org/trunk@29207 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/shortcodes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/shortcodes.php b/src/wp-includes/shortcodes.php
index fc850460f2..55e64a1863 100644
--- a/src/wp-includes/shortcodes.php
+++ b/src/wp-includes/shortcodes.php
@@ -167,8 +167,8 @@ function has_shortcode( $content, $tag ) {
 		foreach ( $matches as $shortcode ) {
 			if ( $tag === $shortcode[2] ) {
 				return true;
-			} elseif ( isset( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
-				return has_shortcode( $shortcode[5], $tag );
+			} elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
+				return true;
 			}
 		}
 	}