Refactor course lessons classes

Automattic · Jun 30, 2020 · a32f366 · a32f366
1 parent a8a7d63
commit a32f366
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/includes/class-sensei-lesson.php b/includes/class-sensei-lesson.php
@@ -3767,35 +3767,29 @@ public function set_quick_edit_admin_defaults( $column_name, $post_id ) {
 	 */
 	public static function single_course_lessons_classes( $classes ) {
 
-		if ( is_singular( 'course' ) ) {
-
-			global $post;
-			$course_id = $post->ID;
+		global $post;
+		$course_id = $post->ID;
 
-			$lesson_classes = array( 'course', 'post' );
-			if ( is_user_logged_in() ) {
+		$lesson_classes = array( 'course', 'post' );
+		if ( is_user_logged_in() ) {
 
-				// Check if Lesson is complete
-				$single_lesson_complete = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
-				if ( $single_lesson_complete ) {
+			// Check if Lesson is complete
+			$single_lesson_complete = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
+			if ( $single_lesson_complete ) {
 
-					$lesson_classes[] = 'completed';
+				$lesson_classes[] = 'completed';
 
-				} // End If Statement
 			} // End If Statement
+		} // End If Statement
 
-			$is_user_taking_course = Sensei_Course::is_user_enrolled( $course_id );
-			if ( Sensei_Utils::is_preview_lesson( get_the_ID() ) && ! $is_user_taking_course ) {
-
-				$lesson_classes[] = 'preview';
-
-			}
+		$is_user_taking_course = Sensei_Course::is_user_enrolled( $course_id );
+		if ( Sensei_Utils::is_preview_lesson( get_the_ID() ) && ! $is_user_taking_course ) {
 
-			$classes = array_merge( $classes, $lesson_classes );
+			$lesson_classes[] = 'preview';
 
 		}
 
-		return $classes;
+		return array_merge( $classes, $lesson_classes );
 
 	}//end single_course_lessons_classes()
 

diff --git a/includes/hooks/template.php b/includes/hooks/template.php
@@ -88,10 +88,6 @@
 add_action( 'sensei_single_course_content_inside_after', 'course_single_lessons', 10 );
 add_action( 'sensei_single_course_lessons_after', array( 'Sensei_Utils', 'restore_wp_query' ) );
 
-// @since 1.9.0
-// add post classes to the lessons on the single course page
-add_filter( 'post_class', array( 'Sensei_Lesson', 'single_course_lessons_classes' ) );
-
 // @since 1.9.0
 // lesson meta information on the single course page
 add_action( 'sensei_single_course_inside_before_lesson', array( 'Sensei_Lesson', 'the_lesson_meta' ), 5 );

diff --git a/includes/template-functions.php b/includes/template-functions.php
@@ -17,6 +17,8 @@ function course_single_lessons() {
 		return;
 	}
 
+	add_filter( 'post_class', [ 'Sensei_Lesson', 'single_course_lessons_classes' ] );
+
 	// load backwards compatible template name if it exists in the users theme
 	$located_template = locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
 	if ( $located_template ) {
@@ -28,6 +30,8 @@ function course_single_lessons() {
 
 	Sensei_Templates::get_template( 'single-course/lessons.php' );
 
+	remove_filter( 'post_class', [ 'Sensei_Lesson', 'single_course_lessons_classes' ] );
+
 } // End course_single_lessons()
 
 	 /**