Improved Shortcode Header Collection Shortcode logic

Author: Joe Hawes

inc/Front/Waymark_Shortcode.php

@@ -169,40 +169,41 @@ function handle_shortcode($shortcode_data, $content = null) {
 		//Header ?
 		$do_header = 0;
 
-		//Start with Setting
+		// Start with Setting
 		$setting = Waymark_Config::get_setting('misc', 'shortcode_options', 'shortcode_header');
 		if (is_numeric($setting)) {
 			$do_header = $setting;
 		}
 
-		// Waymark_Helper::debug($do_header);
+		// Shortcode option set?
+		if (array_key_exists('shortcode_header', $shortcode_data)) {
+			$param = $shortcode_data['shortcode_header'];
+
+			if (is_numeric($param)) {
+				$do_header = $param;
+			}
+		}
 
 		//Map Details Page
 		if (get_post_type() == 'waymark_map') {
 			//Map Details Page
 			if (is_single()) {
 				$do_header = 0;
-				//Archive
-			} else {
-				$do_header = 0;
 			}
+			//Archive
+			// } else {
+			// 	$do_header = 0;
+			// }
 			//I.e. Embedding using the Shortcode
 		} else {
 			//Always for Admin
 			if (current_user_can('administrator') && Waymark_Config::get_setting('misc', 'shortcode_options', 'header_override')) {
 				$do_header = 1;
-			} else {
-				//Shortcode
-				if (array_key_exists('shortcode_header', $shortcode_data)) {
-					$param = $shortcode_data['shortcode_header'];
-
-					if (is_numeric($param)) {
-						$do_header = $param;
-					}
-				}
 			}
 		}
 
+		// Waymark_Helper::debug($do_header);
+
 		//Header (non Map pages only)
 		if ($do_header && sizeof($shortcode_header)) {
 			$out .= '	<!-- Shortcode Header -->' . "\n";