Changeset 13944

Timestamp:

08/02/2024 12:26:40 AM (16 months ago)

Author:

adamwood

Message:

Learn: Sync with git WordPress/learn@36bd656

Location:

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

Files:

• build/lesson-standalone (added)
• build/lesson-standalone/block.json (added)
• build/lesson-standalone/view.asset.php (added)
• build/lesson-standalone/view.js (added)
• functions.php (modified) (1 diff)
• inc/block-config.php (modified) (1 diff)
• inc/query.php (modified) (2 diffs)
• package.json (modified) (2 diffs)
• src/lesson-standalone (added)
• src/lesson-standalone/block.json (added)
• src/lesson-standalone/index.php (added)
• src/lesson-standalone/view.js (added)
• style.css (modified) (1 diff)

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

@@ -14 +14 @@
 require_once __DIR__ . '/src/learning-pathway-header/index.php';
 require_once __DIR__ . '/src/lesson-grid/index.php';
+require_once __DIR__ . '/src/lesson-standalone/index.php';
 require_once __DIR__ . '/src/search-results-context/index.php';
 require_once __DIR__ . '/src/sensei-progress-bar/index.php';

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

@@ -55 +55 @@
     );
 
-    $selected_slug = $wp_query->get( 'post_type' ) ? $wp_query->get( 'post_type' ) : 'any';
+    $post_type = $wp_query->get( 'post_type' );
+    $selected_slug = is_string( $post_type ) ? $post_type : 'any';
     $label = $options[ $selected_slug ] ?? $options['any'];
 

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

@@ -8 +8 @@
 add_action( 'pre_get_posts', __NAMESPACE__ . '\add_language_to_archive_queries' );
 add_action( 'pre_get_posts', __NAMESPACE__ . '\add_excluded_to_lesson_archive_query' );
+add_action( 'pre_get_posts', __NAMESPACE__ . '\filter_search_queries_by_post_type' );
 add_filter( 'request', __NAMESPACE__ . '\handle_all_level_query' );
 
@@ -82 +83 @@
 
 /**
+ * Filter search queries by post type.
+ * Only include courses and lessons in search results unless post_type is set, eg. for an archive search.
+ *
+ * @param WP_Query $query The query object.
+ * @return WP_Query The modified query object.
+ */
+function filter_search_queries_by_post_type( $query ) {
+    if ( ! is_admin() && $query->is_search() && $query->is_main_query() ) {
+        if ( ! $query->get( 'post_type' ) ) {
+            $query->set( 'post_type', array( 'course', 'lesson' ) );
+        }
+    }
+
+    return $query;
+}
+
+/**
  * Modify the request.
  *

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/package.json

@@ -1 +1 @@
 {
-    "name": "wporg-learn-2024",
-    "version": "1.0.0",
-    "description": "Theme for learn.wordpress.org",
+    "name": "wporg-learn-2024",
+    "version": "1.0.0",
+    "description": "Theme for learn.wordpress.org",
     "author": "WordPress.org",
     "license": "GPL-2.0-or-later",
     "private": true,
     "devDependencies": {
+        "@wordpress/icons": "^10.2.0",
         "@wordpress/scripts": "27.2.0",
-        "rtlcss-webpack-plugin": "4.0.7",
-        "@wordpress/icons": "^10.2.0",
-        "react-dom": "^18.3.1"
+        "react-dom": "^18.3.1",
+        "rtlcss-webpack-plugin": "4.0.7"
     },
     "eslintConfig": {
@@ -28 +28 @@
         "lint:css": "wp-scripts lint-style src/**/*.scss",
         "format": "wp-scripts format src -- --config=../../../../.prettierrc.js"
+    },
+    "dependencies": {
+        "lodash": "^4.17.21"
     }
 }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/style.css

@@ -5 +5 @@
  * Author URI: http://wordpress.org/
  * Description: A theme for learn.wordpress.org, built in 2024.
- * Version: 1.0.0-6f3ee52
+ * Version: 1.0.0-f7d8461
  * License: GNU General Public License v2 or later
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html