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
This commit is contained in:
Scott Taylor 2014-07-17 17:37:51 +00:00
parent 6ddc1e5f6d
commit 753a60c709
1 changed files with 2 additions and 2 deletions

View File

@ -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;
}
}
}