fix: learning area globals not accessable to filter hook

Author: harunollyo

classes/Template.php

@@ -166,11 +166,7 @@ public function load_single_course_template( $template ) {
 		global $wp_query;
 		if ( $wp_query->is_single && ! empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] === $this->course_post_type ) {
 			// Check if the slug contains subpage of learning area.
-			$learning_area_subpages = self::make_learning_area_sub_page_nav_items();
-			$subpage                = Input::get( 'subpage' );
-			$subpage_slugs          = array_keys( $learning_area_subpages );
-
-			if ( in_array( $subpage, $subpage_slugs, true ) ) {
+			if ( Input::has( 'subpage' ) ) {
 				$template = tutor_get_template( 'learning-area.index' );
 			} else {
 				do_action( 'single_course_template_before_load', get_the_ID() );
@@ -537,15 +533,15 @@ public static function make_learning_area_sub_page_nav_items( $base_url = '' ):
 
 		$menu_items = array(
 			'qna'         => array(
-				'title' => __( 'Q&A', 'tutor' ),
-				'icon'  => Icon::QA,
-				'url'   => UrlHelper::add_query_params( $base_url, array( 'subpage' => 'qna' ) ),
+				'title'    => __( 'Q&A', 'tutor' ),
+				'icon'     => Icon::QA,
+				'url'      => UrlHelper::add_query_params( $base_url, array( 'subpage' => 'qna' ) ),
 				'template' => tutor_get_template( 'learning-area.subpages.qna' ),
 			),
 			'course-info' => array(
-				'title' => __( 'Course Info', 'tutor' ),
-				'icon'  => Icon::INFO_OCTAGON,
-				'url'   => UrlHelper::add_query_params( $base_url, array( 'subpage' => 'course-info' ) ),
+				'title'    => __( 'Course Info', 'tutor' ),
+				'icon'     => Icon::INFO_OCTAGON,
+				'url'      => UrlHelper::add_query_params( $base_url, array( 'subpage' => 'course-info' ) ),
 				'template' => tutor_get_template( 'learning-area.subpages.course-info' ),
 			),
 		);

classes/Utils.php

@@ -5619,11 +5619,8 @@ public function is_learning_area(): bool {
 		if ( is_single() && ! empty( $current_post_type ) ) {
 			if ( in_array( $current_post_type, $post_types, true ) ) {
 				return true;
-			} elseif ( tutor()->course_post_type === $current_post_type ) {
-				// Check if the subpage is belongs to learning area.
-				$learning_subpage = Input::get( 'subpage' );
-				$allowed_subpages = array_keys( Template::make_learning_area_sub_page_nav_items() );
-				return in_array( $learning_subpage, $allowed_subpages, true );
+			} elseif ( tutor()->course_post_type === $current_post_type && Input::has( 'subpage' ) ) {
+				return true;
 			}
 		}
 
@@ -8542,7 +8539,7 @@ public function is_tutor_dashboard( $subpage = null ) {
 	 *
 	 * @since 1.9.4
 	 * @since 4.0.0 Subpage check support added.
-	 * 				Example: assignments/submitted	
+	 *              Example: assignments/submitted
 	 *
 	 * @param string $subpage subpage.
 	 *
@@ -9521,7 +9518,7 @@ public function not_found_text(): string {
 	 */
 	public function instructor_menus(): array {
 		$menus = array(
-			'index'            => array(
+			'index'         => array(
 				'title' => __( 'Home', 'tutor' ),
 				'icon'  => Icon::HOME,
 			),
@@ -9558,9 +9555,8 @@ public function instructor_menus(): array {
 			),
 		);
 
-
 		if ( $this->should_show_dicussion_menu() ) {
-			$other_menus['discussions'] = array (
+			$other_menus['discussions'] = array(
 				'title'    => __( 'Discussions', 'tutor' ),
 				'auth_cap' => tutor()->instructor_role,
 				'icon'     => Icon::QA,
@@ -9606,10 +9602,10 @@ public function default_menus(): array {
 				'title' => __( 'Courses', 'tutor' ),
 				'icon'  => Icon::COURSES,
 			),
-			'account' => array( 
-				'label' => __( 'Account', 'tutor' ), 
-				'show_ui' => false 
-			)
+			'account' => array(
+				'label'   => __( 'Account', 'tutor' ),
+				'show_ui' => false,
+			),
 		);
 
 		if ( $this->should_show_dicussion_menu() ) {