From 261c0e1599ed8d6d6c040a28074a7be1ce99b2e9 Mon Sep 17 00:00:00 2001 From: Robin Cornett Date: Wed, 23 Oct 2019 18:47:15 -0400 Subject: [PATCH] Update image size references Where possible, use the newly registered image size. The original image size will be available to call on for backup, for images uploaded prior to WordPress 5.3. --- ...ass-displayfeaturedimagegenesis-common.php | 27 +++++-------------- includes/helper-functions.php | 15 +++-------- ...s-displayfeaturedimagegenesis-postmeta.php | 9 ++++--- ...ass-displayfeaturedimagegenesis-output.php | 2 +- ...displayfeaturedimagegenesis-getsetting.php | 2 +- includes/settings/fields-main.php | 4 +-- 6 files changed, 20 insertions(+), 39 deletions(-) diff --git a/includes/class-displayfeaturedimagegenesis-common.php b/includes/class-displayfeaturedimagegenesis-common.php index 7402a0c..d44e9d8 100644 --- a/includes/class-displayfeaturedimagegenesis-common.php +++ b/includes/class-displayfeaturedimagegenesis-common.php @@ -47,8 +47,6 @@ class Display_Featured_Image_Genesis_Common { $item = new stdClass(); - $item->backstretch = ''; - add_filter( 'jetpack_photon_override_image_downsize', '__return_true' ); // turn Photon off so we can get the correct image $image_id = self::set_image_id(); @@ -395,14 +393,7 @@ class Display_Featured_Image_Genesis_Common { * @since 2.5.0 */ public static function image_size() { - $setting = displayfeaturedimagegenesis_get_setting(); - $registered_size = self::banner_image_size(); - $image_size = 'large' !== $setting['image_size'] ? $registered_size : $setting['image_size']; - $post_id = self::get_post_id(); - $post_meta = get_post_meta( $post_id, '_displayfeaturedimagegenesis_disable', true ); - if ( $post_meta && ! is_numeric( $post_meta ) ) { - return $post_meta; - } + $setting = displayfeaturedimagegenesis_get_setting(); /** * Creates display_featured_image_genesis_use_large_image filter to check * whether get_post_type array should use large image instead of backstretch. @@ -411,20 +402,16 @@ class Display_Featured_Image_Genesis_Common { if ( self::is_in_array( 'use_large_image' ) || self::use_large_image_singular( $setting ) ) { return 'large'; } + $image_size = $setting['image_size']; + $post_id = self::get_post_id(); + $post_meta = get_post_meta( $post_id, '_displayfeaturedimagegenesis_disable', true ); + if ( $post_meta && ! is_numeric( $post_meta ) ) { + return 'displayfeaturedimage_backstretch' === $post_meta ? '2048x2048' : $post_meta; + } return apply_filters( 'displayfeaturedimagegenesis_image_size', $image_size ); } - /** - * If the new WordPress image sizes have been registered, use them instead of the old one. - * - * @return string - * @since 3.2.0 - */ - public static function banner_image_size() { - return has_image_size( '2048x2048' ) ? '2048x2048' : 'displayfeaturedimage_backstretch'; - } - /** * Determine if a singular post/page should use a large image instead of backstretch. * diff --git a/includes/helper-functions.php b/includes/helper-functions.php index 5270978..5f359b4 100644 --- a/includes/helper-functions.php +++ b/includes/helper-functions.php @@ -68,11 +68,8 @@ function display_featured_image_genesis_get_term_image_id( $image_id = '' ) { * * @since 2.1.0 */ -function display_featured_image_genesis_get_term_image_url( $size = '' ) { +function display_featured_image_genesis_get_term_image_url( $size = '2048x2048' ) { - if ( ! $size ) { - $size = displayfeaturedimagegenesis_get()->banner_image_size(); - } $image_id = display_featured_image_genesis_get_term_image_id(); $image_url = wp_get_attachment_image_src( $image_id, $size ); @@ -102,11 +99,8 @@ function display_featured_image_genesis_get_default_image_id( $image_id = '' ) { * * @since 2.1.0 */ -function display_featured_image_genesis_get_default_image_url( $size = '' ) { +function display_featured_image_genesis_get_default_image_url( $size = '2048x2048' ) { - if ( ! $size ) { - $size = displayfeaturedimagegenesis_get()->banner_image_size(); - } $image_id = display_featured_image_genesis_get_default_image_id(); $image_url = wp_get_attachment_image_src( $image_id, $size ); @@ -153,11 +147,8 @@ function display_featured_image_genesis_get_cpt_image_id( $image_id = '' ) { * * @since 2.1.0 */ -function display_featured_image_genesis_get_cpt_image_url( $size = '' ) { +function display_featured_image_genesis_get_cpt_image_url( $size = '2048x2048' ) { - if ( ! $size ) { - $size = displayfeaturedimagegenesis_get()->banner_image_size(); - } $image_id = display_featured_image_genesis_get_cpt_image_id(); $image_url = wp_get_attachment_image_src( $image_id, $size ); diff --git a/includes/meta/class-displayfeaturedimagegenesis-postmeta.php b/includes/meta/class-displayfeaturedimagegenesis-postmeta.php index 3bea9ca..800cf58 100644 --- a/includes/meta/class-displayfeaturedimagegenesis-postmeta.php +++ b/includes/meta/class-displayfeaturedimagegenesis-postmeta.php @@ -131,8 +131,8 @@ class Display_Featured_Image_Genesis_Post_Meta { $image_sizes = apply_filters( 'displayfeaturedimagegenesis_image_size_choices', array( - 'banner' => __( 'Use a banner image if it exists', 'display-featured-image-genesis' ), - 'large' => __( 'Use a large (not banner) image', 'display-featured-image-genesis' ), + '2048x2048' => __( 'Use a banner image if it exists', 'display-featured-image-genesis' ), + 'large' => __( 'Use a large (not banner) image', 'display-featured-image-genesis' ), ) ); @@ -173,7 +173,10 @@ class Display_Featured_Image_Genesis_Post_Meta { * @return string */ protected function do_select( $args, $post_id ) { - $value = get_post_meta( $post_id, $args['setting'], true ); + $value = get_post_meta( $post_id, $args['setting'], true ); + if ( 'displayfeaturedimage_backstretch' === $value ) { + $value = '2048x2048'; + } $output = sprintf( '

%1$s