Fixed which header img is displayed for posts/members/news

Entered some checks to make sure member pages only try to display
images if they have an image, and that posts display the featured
image of the /news page (as per the old site), and that inside pages
only show an image if they have one, and otherwise show the default
featured image.

diff --git a/inc/hero-header-news.php b/inc/hero-header-news.php
index 51f73f8..d4ff28c 100644 (file)
--- a/inc/hero-header-news.php
+++ b/inc/hero-header-news.php
@@ -1,31 +1,24 @@
 <div class="row">
 
-       <!-- background-image way
-       <div class="hero-header"<?php
-       /*
-               if (has_post_thumbnail( 34 ) ) {
-                       $image = wp_get_attachment_image_src( get_post_thumbnail_id( 34 ), 'single-post-thumbnail' );
-                       echo ' style="background-image: url('.$image[0].')"' ;
-               } else {
-                       echo ' style="background-image: url('.esc_url(get_template_directory_uri()).'/img/hero-default.jpg);"';
-               }*/
-               ?>>
-
-               </div> -->
-
-
-               <!-- img src way-->
-               <div class="hero-header">
-                       <?php
-                       if (has_post_thumbnail(34) ) {
-                               $image = wp_get_attachment_image_src( get_post_thumbnail_id(34), 'single-post-thumbnail' );
-                               echo '<img src="'.$image[0].'" alt="" >' ;
-                       } else {
-                               echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg)" alt="" >' ;
-                       }
-                        ?>
-
-       </div>
-
+    <div class="hero-header">
+        <?php if (is_page('member-detail') && function_exists('get_member_data')) {
+            $memberID = get_member_data('id');
+            if($memberID){
+                $image_data = apply_filters('member_images',$memberID,true,'original');
+                if ($image_data) {
+                    echo '<img src="'.$image_data.'" alt="" >' ;
+                } else {
+                    echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg" alt="" >';
+                }
+            } else {
+                echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg" alt="" >';
+            }
+        } else if ( "post" == get_post_type() && has_post_thumbnail(34) ) {
+            $image = wp_get_attachment_image_src( get_post_thumbnail_id(34), 'single-post-thumbnail' );
+            echo '<img src="'.$image[0].'" alt="" >' ;
+        } else {
+            echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg" alt="" >' ;
+        } ?>
+    </div>
 
 </div>

diff --git a/inc/hero-header.php b/inc/hero-header.php
index 0c105e7..f465c46 100644 (file)
--- a/inc/hero-header.php
+++ b/inc/hero-header.php
@@ -1,39 +1,24 @@
 <div class="row">
 
-       <!--
-       <div class="hero-header"<?php
-       //if (has_post_thumbnail( $post->ID ) ) {
-       //      $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'single-post-thumbnail' );
-       //      echo ' style="background-image: url('.$image[0].')"' ;
-       //} else {
-       //      echo ' style="background-image: url('.esc_url(get_template_directory_uri()).'/img/hero-default.jpg);"';
-       //} ?>>
-
-       </div>
-       -->
-
-       <div class="hero-header">
-            <?php
-
-            if (is_page('member-detail')) {
-                if(function_exists('get_member_data')){
-                    $memberID = get_member_data('id');
-                    if($memberID){
-                        $image_data = apply_filters('member_images',$memberID,true,'original');
-                        echo '<img src="'.$image_data.'" alt="" >' ;
-                    } else {
-                        echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg" alt="" >';
-                    }
+    <div class="hero-header">
+        <?php if (is_page('member-detail') && function_exists('get_member_data')) {
+            $memberID = get_member_data('id');
+            if($memberID){
+                $image_data = apply_filters('member_images',$memberID,true,'original');
+                if ($image_data) {
+                    echo '<img src="'.$image_data.'" alt="" >' ;
                 } else {
                     echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg" alt="" >';
                 }
-            } else if (has_post_thumbnail( $post->ID ) ) {
-                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'single-post-thumbnail' );
-                echo '<img src="'.$image[0].'" alt="" >' ;
             } else {
-                echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg" alt="" >' ;
-            } ?>
-
-       </div>
+                echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg" alt="" >';
+            }
+        } else if (has_post_thumbnail( $post->ID ) ) {
+            $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'single-post-thumbnail' );
+            echo '<img src="'.$image[0].'" alt="" >' ;
+        } else {
+            echo '<img src="'.esc_url(get_template_directory_uri()).'/img/hero-default.jpg" alt="" >' ;
+        } ?>
+    </div>
 
 </div>