From 41d53a98804212782d347260009668316ff34a3b Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Tue, 11 Aug 2020 13:33:47 -0300 Subject: [PATCH 1/3] use first gallery image on single product when image not assigned --- templates/single-product/product-image.php | 12 +++++++++--- templates/single-product/product-thumbnails.php | 7 +++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/templates/single-product/product-image.php b/templates/single-product/product-image.php index 0399028c8d8..12c1483a44b 100644 --- a/templates/single-product/product-image.php +++ b/templates/single-product/product-image.php @@ -12,7 +12,7 @@ * * @see https://docs.woocommerce.com/document/template-structure/ * @package WooCommerce\Templates - * @version 3.5.1 + * @version 4.5.0 */ defined( 'ABSPATH' ) || exit; @@ -26,11 +26,17 @@ global $product; $columns = apply_filters( 'woocommerce_product_thumbnails_columns', 4 ); $post_thumbnail_id = $product->get_image_id(); +if ( ! $post_thumbnail_id ) { + $gallery_image_ids = $product->get_gallery_image_ids(); + if ( ! empty( $gallery_image_ids ) ) { + $post_thumbnail_id = array_shift( $gallery_image_ids ); + } +} $wrapper_classes = apply_filters( 'woocommerce_single_product_image_gallery_classes', array( 'woocommerce-product-gallery', - 'woocommerce-product-gallery--' . ( $product->get_image_id() ? 'with-images' : 'without-images' ), + 'woocommerce-product-gallery--' . ( $post_thumbnail_id ? 'with-images' : 'without-images' ), 'woocommerce-product-gallery--columns-' . absint( $columns ), 'images', ) @@ -39,7 +45,7 @@ $wrapper_classes = apply_filters(
get_image_id() ) { + if ( $post_thumbnail_id ) { $html = wc_get_gallery_image_html( $post_thumbnail_id, true ); } else { $html = '
'; diff --git a/templates/single-product/product-thumbnails.php b/templates/single-product/product-thumbnails.php index cec3f34fd25..8e840f26926 100644 --- a/templates/single-product/product-thumbnails.php +++ b/templates/single-product/product-thumbnails.php @@ -12,7 +12,7 @@ * * @see https://docs.woocommerce.com/document/template-structure/ * @package WooCommerce\Templates - * @version 3.5.1 + * @version 4.5.0 */ defined( 'ABSPATH' ) || exit; @@ -26,7 +26,10 @@ global $product; $attachment_ids = $product->get_gallery_image_ids(); -if ( $attachment_ids && $product->get_image_id() ) { +if ( $attachment_ids ) { + if ( ! $product->get_image_id() ) { + array_shift( $attachment_ids ); + } foreach ( $attachment_ids as $attachment_id ) { echo apply_filters( 'woocommerce_single_product_image_thumbnail_html', wc_get_gallery_image_html( $attachment_id ), $attachment_id ); // phpcs:disable WordPress.XSS.EscapeOutput.OutputNotEscaped } From 84d6d6c525665bbc8abbc5ed322bc27b7ddd23fe Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Wed, 12 Aug 2020 15:31:27 -0300 Subject: [PATCH 2/3] move image id logic to woocommerce_show_product_* --- includes/wc-template-functions.php | 19 +++++++++++++++++-- templates/single-product/product-image.php | 7 ------- .../single-product/product-thumbnails.php | 5 ----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php index 6009d37cdc8..ce77d2e19d0 100644 --- a/includes/wc-template-functions.php +++ b/includes/wc-template-functions.php @@ -1473,7 +1473,16 @@ if ( ! function_exists( 'woocommerce_show_product_images' ) ) { * Output the product image before the single product summary. */ function woocommerce_show_product_images() { - wc_get_template( 'single-product/product-image.php' ); + global $product; + $post_thumbnail_id = $product->get_image_id(); + if ( ! $post_thumbnail_id ) { + $gallery_image_ids = $product->get_gallery_image_ids(); + if ( ! empty( $gallery_image_ids ) ) { + $post_thumbnail_id = array_shift( $gallery_image_ids ); + } + } + $args = compact( 'post_thumbnail_id', 'gallery_image_ids' ); + wc_get_template( 'single-product/product-image.php', $args ); } } if ( ! function_exists( 'woocommerce_show_product_thumbnails' ) ) { @@ -1482,7 +1491,13 @@ if ( ! function_exists( 'woocommerce_show_product_thumbnails' ) ) { * Output the product thumbnails. */ function woocommerce_show_product_thumbnails() { - wc_get_template( 'single-product/product-thumbnails.php' ); + global $product; + $attachment_ids = $product->get_gallery_image_ids(); + + if ( $attachment_ids && ! $product->get_image_id() ) { + array_shift( $attachment_ids ); + } + wc_get_template( 'single-product/product-thumbnails.php', array( 'attachment_ids' => $attachment_ids ) ); } } diff --git a/templates/single-product/product-image.php b/templates/single-product/product-image.php index 12c1483a44b..02449c348f3 100644 --- a/templates/single-product/product-image.php +++ b/templates/single-product/product-image.php @@ -25,13 +25,6 @@ if ( ! function_exists( 'wc_get_gallery_image_html' ) ) { global $product; $columns = apply_filters( 'woocommerce_product_thumbnails_columns', 4 ); -$post_thumbnail_id = $product->get_image_id(); -if ( ! $post_thumbnail_id ) { - $gallery_image_ids = $product->get_gallery_image_ids(); - if ( ! empty( $gallery_image_ids ) ) { - $post_thumbnail_id = array_shift( $gallery_image_ids ); - } -} $wrapper_classes = apply_filters( 'woocommerce_single_product_image_gallery_classes', array( diff --git a/templates/single-product/product-thumbnails.php b/templates/single-product/product-thumbnails.php index 8e840f26926..3f083346e80 100644 --- a/templates/single-product/product-thumbnails.php +++ b/templates/single-product/product-thumbnails.php @@ -24,12 +24,7 @@ if ( ! function_exists( 'wc_get_gallery_image_html' ) ) { global $product; -$attachment_ids = $product->get_gallery_image_ids(); - if ( $attachment_ids ) { - if ( ! $product->get_image_id() ) { - array_shift( $attachment_ids ); - } foreach ( $attachment_ids as $attachment_id ) { echo apply_filters( 'woocommerce_single_product_image_thumbnail_html', wc_get_gallery_image_html( $attachment_id ), $attachment_id ); // phpcs:disable WordPress.XSS.EscapeOutput.OutputNotEscaped } From e49527cf9d546985a4f9c6db284d9540de302efb Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Fri, 28 Aug 2020 11:34:32 -0300 Subject: [PATCH 3/3] apply changes from feedback --- includes/wc-template-functions.php | 5 ++--- templates/single-product/product-image.php | 2 +- templates/single-product/product-thumbnails.php | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php index ce77d2e19d0..367c6dbb3fe 100644 --- a/includes/wc-template-functions.php +++ b/includes/wc-template-functions.php @@ -1481,8 +1481,7 @@ if ( ! function_exists( 'woocommerce_show_product_images' ) ) { $post_thumbnail_id = array_shift( $gallery_image_ids ); } } - $args = compact( 'post_thumbnail_id', 'gallery_image_ids' ); - wc_get_template( 'single-product/product-image.php', $args ); + wc_get_template( 'single-product/product-thumbnails.php', array( 'post_thumbnail_id' => $post_thumbnail_id ) ); } } if ( ! function_exists( 'woocommerce_show_product_thumbnails' ) ) { @@ -1495,7 +1494,7 @@ if ( ! function_exists( 'woocommerce_show_product_thumbnails' ) ) { $attachment_ids = $product->get_gallery_image_ids(); if ( $attachment_ids && ! $product->get_image_id() ) { - array_shift( $attachment_ids ); + array_shift( $attachment_ids ); } wc_get_template( 'single-product/product-thumbnails.php', array( 'attachment_ids' => $attachment_ids ) ); } diff --git a/templates/single-product/product-image.php b/templates/single-product/product-image.php index 02449c348f3..26407bc902b 100644 --- a/templates/single-product/product-image.php +++ b/templates/single-product/product-image.php @@ -12,7 +12,7 @@ * * @see https://docs.woocommerce.com/document/template-structure/ * @package WooCommerce\Templates - * @version 4.5.0 + * @version 4.6.0 */ defined( 'ABSPATH' ) || exit; diff --git a/templates/single-product/product-thumbnails.php b/templates/single-product/product-thumbnails.php index 3f083346e80..2bebd8a4e5a 100644 --- a/templates/single-product/product-thumbnails.php +++ b/templates/single-product/product-thumbnails.php @@ -12,7 +12,7 @@ * * @see https://docs.woocommerce.com/document/template-structure/ * @package WooCommerce\Templates - * @version 4.5.0 + * @version 4.6.0 */ defined( 'ABSPATH' ) || exit;