10h30/display-featured-image-genesis
1
0
Fork 0
mirror of https://github.com/10h30/display-featured-image-genesis.git synced 2026-07-17 13:33:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify image variables

Browse Source
This commit is contained in:
Robin Cornett
2015-02-26 15:38:01 -05:00
parent 55592f1303
commit fcc0021a45
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/class-displayfeaturedimagegenesis-common.php
+8 -8
View File
@@ -35,6 +35,7 @@ class Display_Featured_Image_Genesis_Common {
$displaysetting = get_option( 'displayfeaturedimagegenesis' );
$move_excerpts = $displaysetting['move_excerpts'];
$postspage_image = get_post_thumbnail_id( $postspage );
$fallback = esc_attr( $displaysetting['default'] ); // url only
if ( is_singular() ) { // just checking for handling conditional variables set by width
$thumb_metadata = wp_get_attachment_metadata( get_post_thumbnail_id( get_the_ID() ) ); // needed only for the next line
@@ -46,8 +47,7 @@ class Display_Featured_Image_Genesis_Common {
// sitewide variables used outside this function
$item->backstretch = '';
$item->fallback = esc_attr( $displaysetting['default'] ); // url only
$item->fallback_id = self::get_image_id( $item->fallback ); // gets image id with attached metadata
$item->fallback_id = self::get_image_id( $fallback ); // gets image id with attached metadata
$item->large = absint( get_option( 'large_size_w' ) );
$item->medium = absint( get_option( 'medium_size_w' ) );
$item->reduce = absint( $displaysetting['less_header'] );
@@ -63,7 +63,7 @@ class Display_Featured_Image_Genesis_Common {
$use_fallback = apply_filters( 'display_featured_image_genesis_use_default', self::$post_types );
// set here with fallback preemptively, if it exists
if ( ! empty( $item->fallback ) ) {
if ( ! empty( $fallback ) ) {
$image_id = $item->fallback_id;
}
@@ -73,7 +73,7 @@ class Display_Featured_Image_Genesis_Common {
}
$object = get_queried_object();
if ( ! is_author() && ! is_admin() ) {
if ( is_main_query() && ( ! is_author() && ! is_admin() && ! is_search() ) ) {
if ( $object->name ) { // results in post type on cpt archive
$post_type = $object->name;
}
@@ -97,7 +97,7 @@ class Display_Featured_Image_Genesis_Common {
$image_id = self::get_image_id( $term_meta['term_image'] );
}
}
// any singular post/page/CPT or there is no $item->fallback
// any singular post/page/CPT or there is no $fallback
elseif ( is_singular() && ! in_array( get_post_type(), $use_fallback ) ) {
/**
* create filter to use taxonomy image if single post doesn't have a thumbnail, but one of its terms does.
@@ -110,9 +110,9 @@ class Display_Featured_Image_Genesis_Common {
}
elseif ( ! has_post_thumbnail() || in_array( get_post_type(), $use_tax_image ) ) {
$term_image = display_featured_image_genesis_get_term_image();
if ( ! empty( $term_image ) ) {
$image_id = $term_image;
$term_image_id = display_featured_image_genesis_get_term_image_id();
if ( ! empty( $term_image_id ) ) {
$image_id = $term_image_id;
}
}
}
includes/helper-functions.php
+1 -2
View File
@@ -60,8 +60,7 @@ function display_featured_image_genesis_get_term_image_url( $size='displayfeatur
function display_featured_image_genesis_get_default_image_id() {
$item = Display_Featured_Image_Genesis_Common::get_image_variables();
$image_id = Display_Featured_Image_Genesis_Common::get_image_id( $item->fallback );
$image_id = $item->fallback_id;
return $image_id;