Changeset 13941 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/query.php

Timestamp:

08/01/2024 09:29:33 PM (17 months ago)

Author:

renyot

Message:

Learn: Sync with git WordPress/learn@59cde32

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/query.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/query.php

@@ -7 +7 @@
 
 add_action( 'pre_get_posts', __NAMESPACE__ . '\add_language_to_archive_queries' );
-add_action( 'pre_get_posts', __NAMESPACE__ . '\handle_all_level_query' );
 add_action( 'pre_get_posts', __NAMESPACE__ . '\add_excluded_to_lesson_archive_query' );
+add_filter( 'request', __NAMESPACE__ . '\handle_all_level_query' );
 
 /**
@@ -41 +41 @@
         }
     }
-
-    return $query;
-}
-
-/**
- * Modify the main query.
- * If the 'all' level filter is set in the query, remove it to return all posts.
- *
- * @param WP_Query $query The main query.
- * @return WP_Query
- */
-function handle_all_level_query( $query ) {
-    if ( is_admin() || ! $query->is_main_query() ) {
-        return;
-    }
-
-    $level = $query->get( 'wporg_lesson_level' );
-
-    if ( 'all' === $level ) {
-        $query->set( 'wporg_lesson_level', '' );
-    }
-
-    return $query;
 }
 
@@ -103 +80 @@
     }
 }
+
+/**
+ * Modify the request.
+ *
+ * Update the query_vars to reset 'all' to an empty string.
+ *
+ * @param array $query_vars The array of requested query variables.
+ *
+ * @return array
+ */
+function handle_all_level_query( $query_vars ) {
+    if ( is_admin() ) {
+        return;
+    }
+
+    $level = $query_vars['wporg_lesson_level'] ?? '';
+
+    if ( 'all' === $level ) {
+        $query_vars['wporg_lesson_level'] = '';
+    }
+
+    return $query_vars;
+}