Skip to content

[Backport to release/10.3] Fix: respect theme support to control legacy script loading for block themes #61837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2025
Merged

[Backport to release/10.3] Fix: respect theme support to control legacy script loading for block themes #61837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .../woocommerce/changelog/fix-use-theme-support-to-control-legacy-script-loading-block-theme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Legacy assets: respect theme support when using Classic Template or Product Image Gallery blocks with block themes.
2 changes: 1 addition & 1 deletion plugins/woocommerce/includes/class-wc-frontend-scripts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ public static function load_scripts() {
}

// Load gallery scripts on product pages only if supported.
if ( is_product() || ( ! empty( $post->post_content ) && strstr( $post->post_content, '[product_page' ) ) ) {
if ( ( is_product() && ! wp_is_block_theme() ) || ( ! empty( $post->post_content ) && strstr( $post->post_content, '[product_page' ) ) ) {
if ( current_theme_supports( 'wc-product-gallery-zoom' ) ) {
self::enqueue_script( 'wc-zoom' );
}
Expand Down
5 changes: 5 additions & 0 deletions plugins/woocommerce/includes/class-wc-template-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ public static function init() {
if ( self::$theme_support ) {
add_filter( 'template_include', array( __CLASS__, 'template_loader' ) );
add_filter( 'comments_template', array( __CLASS__, 'comments_template_loader' ) );

// Loads gallery scripts on Product page for FSE themes.
if ( wp_is_block_theme() ) {
self::add_support_for_product_page_gallery();
}
} else {
// Unsupported themes.
add_action( 'template_redirect', array( __CLASS__, 'unsupported_theme_init' ) );
Expand Down
30 changes: 19 additions & 11 deletions plugins/woocommerce/src/Blocks/BlockTypes/ClassicTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,26 @@ protected function enqueue_assets( $attributes, $content, $block ) {
*/
public function enqueue_legacy_assets() {
// Legacy script dependencies for backward compatibility.
wp_enqueue_script( 'wc-zoom' );
wp_enqueue_script( 'wc-flexslider' );
wp_enqueue_script( 'wc-photoswipe-ui-default' );
wp_enqueue_style( 'photoswipe-default-skin' );
wp_enqueue_script( 'wc-single-product' );
if ( current_theme_supports( 'wc-product-gallery-zoom' ) ) {
wp_enqueue_script( 'wc-zoom' );
}

add_action(
'wp_footer',
function () {
wc_get_template( 'single-product/photoswipe.php' );
}
);
if ( current_theme_supports( 'wc-product-gallery-slider' ) ) {
wp_enqueue_script( 'wc-flexslider' );
}

if ( current_theme_supports( 'wc-product-gallery-lightbox' ) ) {
wp_enqueue_script( 'wc-photoswipe-ui-default' );
wp_enqueue_style( 'photoswipe-default-skin' );
add_action(
'wp_footer',
function () {
wc_get_template( 'single-product/photoswipe.php' );
}
);
}

wp_enqueue_script( 'wc-single-product' );
}


Expand Down
39 changes: 27 additions & 12 deletions plugins/woocommerce/src/Blocks/BlockTypes/ProductImageGallery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,33 @@ protected function enqueue_assets( $attributes, $content, $block ) {
*/
public function enqueue_legacy_assets() {
// Legacy script dependencies for backward compatibility.
wp_enqueue_script( 'wc-zoom' );
wp_enqueue_script( 'wc-flexslider' );
wp_enqueue_script( 'wc-photoswipe-ui-default' );
wp_enqueue_style( 'photoswipe-default-skin' );
wp_enqueue_script( 'wc-single-product' );

add_action(
'wp_footer',
function () {
wc_get_template( 'single-product/photoswipe.php' );
}
);
$need_single_product_script = false;

if ( current_theme_supports( 'wc-product-gallery-zoom' ) ) {
$need_single_product_script = true;
wp_enqueue_script( 'wc-zoom' );
}

if ( current_theme_supports( 'wc-product-gallery-slider' ) ) {
$need_single_product_script = true;
wp_enqueue_script( 'wc-flexslider' );
}

if ( current_theme_supports( 'wc-product-gallery-lightbox' ) ) {
$need_single_product_script = true;
wp_enqueue_script( 'wc-photoswipe-ui-default' );
wp_enqueue_style( 'photoswipe-default-skin' );
add_action(
'wp_footer',
function () {
wc_get_template( 'single-product/photoswipe.php' );
}
);
}

if ( $need_single_product_script ) {
wp_enqueue_script( 'wc-single-product' );
}
}

/**
Expand Down
Loading