Update block theme conditionals in BlockTemplateController (#5335)

woocommerce · Dec 8, 2021 · fc58c0f · fc58c0f
1 parent ad0ed91
commit fc58c0f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/BlockTemplatesController.php b/src/BlockTemplatesController.php
@@ -153,7 +153,10 @@ public function get_single_block_template( $template, $id, $template_type ) {
 	 * @return array
 	 */
 	public function add_block_templates( $query_result, $query, $template_type ) {
-		if ( ! function_exists( 'gutenberg_supports_block_templates' ) || ! gutenberg_supports_block_templates() ) {
+		if (
+			( ! function_exists( 'wp_is_block_theme' ) || ! wp_is_block_theme() ) &&
+			( ! function_exists( 'gutenberg_supports_block_templates' ) || ! gutenberg_supports_block_templates() )
+		) {
 			return $query_result;
 		}
 
@@ -406,7 +409,11 @@ public function block_template_is_available( $template_name, $template_type = 'w
 	 * Renders the default block template from Woo Blocks if no theme templates exist.
 	 */
 	public function render_block_template() {
-		if ( is_embed() || ! function_exists( 'gutenberg_supports_block_templates' ) || ! gutenberg_supports_block_templates() ) {
+		if (
+			is_embed() ||
+			( ! function_exists( 'wp_is_block_theme' ) || ! wp_is_block_theme() ) &&
+			( ! function_exists( 'gutenberg_supports_block_templates' ) || ! gutenberg_supports_block_templates() )
+		) {
 			return;
 		}