Fix email template rendering issue (#2256)

* Handle global $email_template properly

- Ensure that it is reset after it is used.
- Ensure that we do not mangle template loading for emails when
  $email_template is set.

* Fix issue in test

includes/class-sensei-emails.php

@@ -215,6 +215,7 @@ function load_template( $template = '' ) {
 		include( $template );
 		do_action( 'sensei_after_email_template', $email_template );
 
+		$email_template = '';
 		return ob_get_clean();
 	}
 

includes/class-sensei-templates.php

@@ -140,12 +140,6 @@ public static function template_loader ( $template = '' ) {
 
         global $wp_query, $email_template;
 
-		// If our unsupported theme renderer is handling the request, we do not
-		// need to find a custom template.
-		if ( Sensei_Unsupported_Themes::get_instance()->is_handling_request() ) {
-			return $template;
-		}
-
         $find = array( 'woothemes-sensei.php' );
         $file = '';
 
@@ -155,6 +149,14 @@ public static function template_loader ( $template = '' ) {
             $find[] = $file;
             $find[] = Sensei()->template_url . $file;
 
+		} elseif ( Sensei_Unsupported_Themes::get_instance()->is_handling_request() ) {
+
+			/*
+			* If our unsupported theme renderer is handling the request, we do
+			* not need to find a custom template.
+			*/
+			$file = null;
+
         } elseif ( is_single() && get_post_type() == 'course' ) {
 
             // possible backward compatible template include if theme overrides content-single-course.php

tests/unit-tests/unsupported-theme-handlers/test-class-sensei-unsupported-theme-handler-page-imitator.php

@@ -156,9 +156,8 @@ private function setupUnsupportedPage() {
 		$this->course = $this->factory->course->create_and_get();
 		$this->factory->post->create_many( 2 );
 
-		// Setup $wp_query to be for the lessons in Module 2.
 		$args         = array(
-			'post_type' => 'post',
+			'post_type' => 'course',
 		);
 		$wp_query     = new WP_Query( $args );
 		$wp_the_query = $wp_query;