Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: disable compatibility layer for block themes that have a default block template (https://github.com/woocommerce/woocommerce-blocks/pull/8758)

This commit is contained in:
Luigi Teschio 2023-03-15 12:20:08 +01:00 committed by GitHub
parent 8a35fc0fcf
commit 5a3e7b5afc
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/woocommerce-blocks/src/BlockTemplatesController.php
View File

@ -538,9 +538,7 @@ class BlockTemplatesController {
}
if (
is_singular( 'product' ) &&
! BlockTemplateUtils::theme_has_template( 'single-product' ) &&
$this->block_template_is_available( 'single-product' )
is_singular( 'product' ) && $this->block_template_is_available( 'single-product' )
) {
$templates = get_block_templates( array( 'slug__in' => array( 'single-product' ) ) );
@ -548,11 +546,11 @@ class BlockTemplatesController {
add_filter( 'woocommerce_disable_compatibility_layer', '__return_true' );
}
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
if ( ! BlockTemplateUtils::theme_has_template( 'single-product' ) ) {
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
}
} elseif (
( is_product_taxonomy() && is_tax( 'product_cat' ) ) &&
! BlockTemplateUtils::theme_has_template( 'taxonomy-product_cat' ) &&
$this->block_template_is_available( 'taxonomy-product_cat' )
( is_product_taxonomy() && is_tax( 'product_cat' ) ) && $this->block_template_is_available( 'taxonomy-product_cat' )
) {
$templates = get_block_templates( array( 'slug__in' => array( 'taxonomy-product_cat' ) ) );
@ -560,11 +558,11 @@ class BlockTemplatesController {
add_filter( 'woocommerce_disable_compatibility_layer', '__return_true' );
}
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
if ( ! BlockTemplateUtils::theme_has_template( 'taxonomy-product_cat' ) ) {
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
}
} elseif (
( is_product_taxonomy() && is_tax( 'product_tag' ) ) &&
! BlockTemplateUtils::theme_has_template( 'taxonomy-product_tag' ) &&
$this->block_template_is_available( 'taxonomy-product_tag' )
( is_product_taxonomy() && is_tax( 'product_tag' ) ) && $this->block_template_is_available( 'taxonomy-product_tag' )
) {
$templates = get_block_templates( array( 'slug__in' => array( 'taxonomy-product_tag' ) ) );
@ -572,11 +570,11 @@ class BlockTemplatesController {
add_filter( 'woocommerce_disable_compatibility_layer', '__return_true' );
}
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
if ( ! BlockTemplateUtils::theme_has_template( 'taxonomy-product_tag' ) ) {
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
}
} elseif (
( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) &&
! BlockTemplateUtils::theme_has_template( 'archive-product' ) &&
$this->block_template_is_available( 'archive-product' )
( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) && $this->block_template_is_available( 'archive-product' )
) {
$templates = get_block_templates( array( 'slug__in' => array( 'archive-product' ) ) );
@ -584,16 +582,16 @@ class BlockTemplatesController {
add_filter( 'woocommerce_disable_compatibility_layer', '__return_true' );
}
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
if ( ! BlockTemplateUtils::theme_has_template( 'archive-product' ) ) {
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
}
} else {
$queried_object = get_queried_object();
if ( is_null( $queried_object ) ) {
return;
}
if ( isset( $queried_object->taxonomy ) && taxonomy_is_product_attribute( $queried_object->taxonomy ) &&
! BlockTemplateUtils::theme_has_template( ProductAttributeTemplate::SLUG ) &&
$this->block_template_is_available( ProductAttributeTemplate::SLUG )
if ( isset( $queried_object->taxonomy ) && taxonomy_is_product_attribute( $queried_object->taxonomy ) && $this->block_template_is_available( ProductAttributeTemplate::SLUG )
) {
$templates = get_block_templates( array( 'slug__in' => array( ProductAttributeTemplate::SLUG ) ) );
@ -601,7 +599,9 @@ class BlockTemplatesController {
add_filter( 'woocommerce_disable_compatibility_layer', '__return_true' );
}
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
if ( ! BlockTemplateUtils::theme_has_template( ProductAttributeTemplate::SLUG ) ) {
add_filter( 'woocommerce_has_block_template', '__return_true', 10, 0 );
}
}
}
}