Changeset 10528 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php

Timestamp:

12/17/2020 12:13:25 AM (4 years ago)

Author:

coreymckrill

Message:

WordPress.org Learn: Sync with GitHub

​https://github.com/WordPress/learn/compare/49a011b0d85dcf472f0c0d97aa138f5c14d40a90...2b9e66afc2060e7e6c9ae0a861779c83e35d82eb

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php (modified) (6 diffs)

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

@@ -18 +18 @@
 
     global $woothemes_sensei;
-    remove_action( 'sensei_before_main_content', array( $woothemes_sensei->frontend, 'sensei_output_content_wrapper' ) );
-    remove_action( 'sensei_after_main_content', array( $woothemes_sensei->frontend, 'sensei_output_content_wrapper_end' ) );
+    if ( $woothemes_sensei ) {
+        remove_action( 'sensei_before_main_content', array( $woothemes_sensei->frontend, 'sensei_output_content_wrapper' ) );
+        remove_action( 'sensei_after_main_content', array( $woothemes_sensei->frontend, 'sensei_output_content_wrapper_end' ) );
+    }
 
     // The parent wporg theme is designed for use on wordpress.org/* and assumes locale-domains are available.
@@ -241 +243 @@
     }
 
-    $valid_post_types = array( 'lesson-plan', 'wporg_workshop' );
+    $valid_post_types = array( 'lesson-plan', 'wporg_workshop', 'course' );
 
     if ( $query->is_main_query() && $query->is_post_type_archive( $valid_post_types ) ) {
         wporg_archive_maybe_apply_query_filters( $query );
 
-        if ( $query->is_post_type_archive( 'wporg_workshop' ) && true !== $query->get( 'wporg_workshop_filters' ) ) {
+        if ( $query->is_post_type_archive( 'wporg_workshop' ) && true !== $query->get( 'wporg_archive_filters' ) ) {
             $featured = wporg_get_featured_workshops();
 
@@ -300 +302 @@
         INPUT_GET,
         array(
-            'series'   => FILTER_SANITIZE_NUMBER_INT,
-            'topic'    => FILTER_SANITIZE_NUMBER_INT,
+            'search'   => FILTER_SANITIZE_STRING,
+            'captions' => FILTER_SANITIZE_STRING,
             'language' => FILTER_SANITIZE_STRING,
-            'captions' => FILTER_SANITIZE_STRING,
-            'search'   => FILTER_SANITIZE_STRING,
+            'audience' => array(
+                'filter' => FILTER_VALIDATE_INT,
+                'flags'  => FILTER_REQUIRE_ARRAY,
+            ),
+            'duration' => array(
+                'filter' => FILTER_VALIDATE_INT,
+                'flags'  => FILTER_REQUIRE_ARRAY,
+            ),
+            'level'    => array(
+                'filter' => FILTER_VALIDATE_INT,
+                'flags'  => FILTER_REQUIRE_ARRAY,
+            ),
+            'series'   => FILTER_VALIDATE_INT,
+            'topic'    => FILTER_VALIDATE_INT,
+            'type'     => array(
+                'filter' => FILTER_VALIDATE_INT,
+                'flags'  => FILTER_REQUIRE_ARRAY,
+            ),
         ),
         false
+    );
+
+    $entity_map = array(
+        'captions' => 'video_caption_language',
+        'language' => 'video_language',
+        'audience' => 'audience',
+        'duration' => 'duration',
+        'level'    => 'level',
+        'series'   => 'wporg_workshop_series',
+        'topic'    => 'topic',
+        'type'     => 'instruction_type',
     );
 
@@ -318 +347 @@
         foreach ( $filters as $filter_name => $filter_value ) {
             switch ( $filter_name ) {
-                case 'series':
-                    if ( ! empty( $tax_query ) ) {
-                        $tax_query['relation'] = 'AND';
-                    }
-                    $tax_query[] = array(
-                        'taxonomy' => 'wporg_workshop_series',
-                        'terms'    => $filter_value,
-                    );
+                case 'search':
+                    $query->set( 's', $filter_value );
+                    $is_filtered = true;
                     break;
-                case 'topic':
-                    if ( ! empty( $tax_query ) ) {
-                        $tax_query['relation'] = 'AND';
-                    }
-                    $tax_query[] = array(
-                        'taxonomy' => 'topic',
-                        'terms'    => $filter_value,
-                    );
-                    break;
+                case 'captions':
                 case 'language':
                     if ( ! empty( $meta_query ) ) {
@@ -341 +357 @@
                     }
                     $meta_query[] = array(
-                        'key'   => 'video_language',
+                        'key'   => $entity_map[ $filter_name ],
                         'value' => $filter_value,
                     );
                     break;
-                case 'captions':
-                    if ( ! empty( $meta_query ) ) {
-                        $meta_query['relation'] = 'AND';
+                case 'audience':
+                case 'duration':
+                case 'level':
+                case 'series':
+                case 'topic':
+                case 'type':
+                    if ( ! empty( $tax_query ) ) {
+                        $tax_query['relation'] = 'AND';
                     }
-                    $meta_query[] = array(
-                        'key'   => 'video_caption_language',
-                        'value' => $filter_value,
+                    $tax_query[] = array(
+                        'taxonomy' => $entity_map[ $filter_name ],
+                        'terms'    => $filter_value,
                     );
-                    break;
-                case 'search':
-                    $query->set( 's', $filter_value );
-                    $is_filtered = true;
                     break;
             }
@@ -373 +390 @@
 
     if ( $is_filtered ) {
-        $query->set( 'wporg_workshop_filters', true );
+        $query->set( 'wporg_archive_filters', true );
     }
 }