Fix issue with nested shortcodes

frontend/class-flowplayer5-frontend.php

@@ -25,7 +25,6 @@
 class Flowplayer5_Frontend {
 
 	public $has_flowplayer_video = '';
-	public $has_flowplayer_shortcode = '';
 
 	/**
 	 * Initialize the plugin by setting localization, filters, and administration functions.
@@ -163,7 +162,7 @@ public function global_config_script() {
 		$embed_swf     = ( ! empty ( $options['swf'] ) ? $options['swf'] : '' );
 		$asf_js        = ( ! empty ( $options['asf_js'] ) ? $options['asf_js'] : '' );
 
-		if ( $embed_library || $embed_script || $embed_skin || $embed_swf ) {
+		if ( ( $embed_library || $embed_script || $embed_skin || $embed_swf ) && $this->has_flowplayer_video ) {
 
 			$return = '<!-- flowplayer global options -->';
 			$return .= '<script>';
@@ -192,17 +191,16 @@ public function global_config_script() {
 	}
 
 	public function has_flowplayer_shortcode() {
-		if ( is_404() || ! empty( $this->has_flowplayer_shortcode ) ) {
+		if ( is_404() || isset( $this->has_flowplayer_shortcode ) ) {
 			return;
 		}
 
 		$post           = get_queried_object();
 		$has_shortcode  = array();
 		$shortcode_args = array();
 
-		if ( null !== $post && is_single() ) {
-			$post_content = isset( $post->post_content ) ? $post->post_content : '';
-			$shortcode_args = fp5_has_shortcode_arg( $post_content, 'flowplayer' );
+		if ( isset( $post->post_content ) ) {
+			$shortcode_args = fp5_has_shortcode_arg( $post->post_content, 'flowplayer' );
 			if ( is_array( $shortcode_args ) ) {
 				foreach ( $shortcode_args as $key => $value ) {
 					if ( isset( $value['id'] ) ) {
@@ -239,12 +237,14 @@ public function has_flowplayer_video() {
 		}
 
 		$has_video = 'flowplayer5' == get_post_type() || is_active_widget( false, false, 'flowplayer5-video-widget', true );
+		$has_video = apply_filters( 'fp5_filter_has_shortcode', $has_video );
+
 		if ( ! $has_video ) {
 			$this->has_flowplayer_shortcode();
 			$has_video = ! empty ( $this->has_flowplayer_shortcode );
 		}
 
-		$this->has_flowplayer_video = apply_filters( 'fp5_filter_has_shortcode', $has_video );
+		$this->has_flowplayer_video = $has_video;
 	}
 
 	public function is_multiresolution() {

includes/functions.php

@@ -83,7 +83,7 @@ function fp5_has_shortcode_arg( $content, $tag ) {
 			if ( $tag === $shortcode[2] ) {
 				$shortcode_arg[] = shortcode_parse_atts( $shortcode[3] );
 			} elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
-				$shortcode_arg[] = fp5_has_shortcode_arg( $shortcode[5], $tag );
+				$shortcode_arg = fp5_has_shortcode_arg( $shortcode[5], $tag );
 			}
 		}
 		return $shortcode_arg;