= 4.2.2.4 =

~ Block theme: not call get_header, get_footer on block theme.
LearnPress · Mar 27, 2023 · a2f83fd · a2f83fd
1 parent 55d6163
commit a2f83fd
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/inc/block-template/class-abstract-block-template.php b/inc/block-template/class-abstract-block-template.php
@@ -58,8 +58,6 @@ public function render_content_block_template( array $attributes ) {
 			ob_start();
 			if ( isset( $attributes['template'] ) ) {
 				Template::instance()->get_frontend_template( $attributes['template'] );
-			} else {
-				Template::instance()->get_frontend_template( 'archive-course.php' );
 			}
 
 			$content = ob_get_clean();

diff --git a/inc/block-template/class-block-template-archive-course.php b/inc/block-template/class-block-template-archive-course.php
@@ -24,7 +24,9 @@ public function __construct() {
 	 * @return false|string
 	 */
 	public function render_content_block_template( array $attributes ) {
-		//      Debug::var_dump($attributes);
+		if ( ! isset( $attributes['template'] ) ) {
+			$attributes['template'] = 'archive-course.php';
+		}
 		return parent::render_content_block_template( $attributes );
 	}
 }
diff --git a/templates/archive-course.php b/templates/archive-course.php
@@ -14,9 +14,9 @@
  *
  * @see LP_Template_General::template_header()
  */
-//if ( empty( $is_block_theme ) ) {
-//	do_action( 'learn-press/template-header' );
-//}
+if ( ! wp_is_block_theme() ) {
+	do_action( 'learn-press/template-header' );
+}
 
 /**
  * LP Hook
@@ -89,6 +89,6 @@
  *
  * @see   LP_Template_General::template_footer()
  */
-if ( empty( $is_block_theme ) ) {
-	//do_action( 'learn-press/template-footer' );
+if ( ! wp_is_block_theme() ) {
+	do_action( 'learn-press/template-footer' );
 }
diff --git a/templates/content-single-item.php b/templates/content-single-item.php
@@ -15,7 +15,7 @@
  *
  * @see LP_Template_General::template_header()
  */
-if ( empty( $is_block_theme ) ) {
+if ( ! wp_is_block_theme() ) {
 	do_action( 'learn-press/template-header' );
 }
 
@@ -70,6 +70,6 @@
  *
  * @see LP_Template_General::template_footer()
  */
-if ( empty( $is_block_theme ) ) {
+if ( ! wp_is_block_theme() ) {
 	do_action( 'learn-press/template-footer' );
 }
diff --git a/templates/pages/checkout.php b/templates/pages/checkout.php
@@ -9,7 +9,7 @@
 
 defined( 'ABSPATH' ) or die;
 
-if ( empty( $is_block_theme ) ) {
+if ( ! wp_is_block_theme() ) {
 	get_header();
 }
 
@@ -46,6 +46,6 @@
 do_action( 'learnpress/template/pages/checkout/after-content' );
 do_action( 'learn-press/after-main-content' );
 
-if ( empty( $is_block_theme ) ) {
+if ( ! wp_is_block_theme() ) {
 	get_footer();
 }
diff --git a/templates/single-course.php b/templates/single-course.php
@@ -12,7 +12,7 @@
 /**
  * Header for page
  */
-if ( empty( $is_block_theme ) ) {
+if ( ! wp_is_block_theme() ) {
 	get_header( 'course' );
 }
 
@@ -41,6 +41,6 @@
 /**
  * Footer for page
  */
-if ( empty( $is_block_theme ) ) {
+if ( ! wp_is_block_theme() ) {
 	get_footer( 'course' );
 }