Changeset 1236688

Timestamp:

09/02/2015 09:32:47 PM (9 years ago)

Author:

wpsmith

Message:

Fix always over-riding featured image

File:

• genesis-featured-images/trunk/lib/functions.php (modified) (2 diffs)

genesis-featured-images/trunk/lib/functions.php

@@ -38 +38 @@
 }
 
+
+
+
+
 /**
  * Filters genesis_get_image() returning the default image if html or url are empty.
  * 
  */
-add_filter( 'genesis_get_image_default_args', 'gfi_get_image_default_args', 10, 2 );
+add_filter( 'genesis_get_image_default_args', 'gfi_get_image_default_args', 10, 2 );
 function gfi_get_image_default_args( $defaults, $args ) {
-    
     if ( 'first-attached' !== $defaults['fallback'] || !genesis_get_option( 'featimg_default_enable' ) ) {
         return $defaults;
     }
-    
+
+    // Ok, now let's check to see if an image exists
     $data = gfi_get_image_data( $args );
-    
+
     return array(
         'id'   => $data['id'],
@@ -61 +65 @@
 add_filter( 'genesis_pre_get_image' , 'genesis_get_image_default' , 10 , 6 );
 function genesis_get_image_default( $pre, $args, $post ) {
-    
-    if ( $pre !== false || !genesis_get_option( 'featimg_default_enable' ) ) {
+
+    if ( $pre !== false || !genesis_get_option( 'featimg_default_enable' ) ) {
         return $pre;
     }
-    
+
+    // Get first-attached
+    if ( 'first-attached' === $args['fallback'] && genesis_get_image_id( $args['num'], $args['post_id'] ) ) {
+        return $pre;
+    }
+
+    // Now let's do our featured Image
     $data = gfi_get_image_data( $args );