Changeset 11413

Timestamp:

01/06/2022 05:56:14 AM (4 years ago)

Author:

tellyworth

Message:

WordPress.org Learn: sync with GitHub

​https://github.com/WordPress/learn/compare/0e236c1901eb301d0f392b94b3345cb6bae7aa84..3007947d3c47ff5c5a1793a27c7168db466198a6

Props ryelle, iandunn, hlashbrooke.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/wporg-learn/inc/blocks.php (modified) (2 diffs)
• plugins/wporg-learn/inc/taxonomy.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/header.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/template-parts/component-lesson-filters.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/blocks.php

@@ -77 +77 @@
     $captions  = get_post_meta( $post->ID, 'video_caption_language' );
 
+    $version_ids    = wp_get_post_terms( $post->ID, 'wporg_wp_version', array( 'fields' => 'ids' ) );
+    $version_names  = wp_get_post_terms( $post->ID, 'wporg_wp_version', array( 'fields' => 'names' ) );
+
     $topic_names = array();
     foreach ( $topic_ids as $id ) {
@@ -92 +95 @@
             'param' => $topic_ids,
             'value' => $topic_names,
+        ),
+        'wp_version' => array(
+            'label' => __( 'Related Version', 'wporg-learn' ),
+            'param' => $version_ids,
+            'value' => $version_names,
         ),
         'level' => array(

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/taxonomy.php

@@ -516 +516 @@
     );
 
-    $post_types = array( 'lesson-plan', 'wporg_workshop', 'course', 'lesson' );
+    $post_types = array( 'lesson-plan', 'wporg_workshop', 'course', 'lesson', 'meeting' );
 
     register_taxonomy( 'wporg_wp_version', $post_types, $args );

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

@@ -15 +15 @@
 
 if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
+    // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
     echo do_blocks( '<!-- wp:wporg/global-header /-->' );
 } else {

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-lesson-filters.php

@@ -24 +24 @@
         'name'    => 'type',
         'current' => filter_input( INPUT_GET, 'type', FILTER_VALIDATE_INT, FILTER_REQUIRE_ARRAY ) ?? array(),
+    ),
+    array(
+        'label'   => get_taxonomy_labels( get_taxonomy( 'wporg_wp_version' ) )->singular_name,
+        'terms'   => get_terms( array( 'taxonomy' => 'wporg_wp_version' ) ),
+        'name'    => 'wp_version',
+        'current' => filter_input( INPUT_GET, 'wp_version', FILTER_VALIDATE_INT, FILTER_REQUIRE_ARRAY ) ?? array(),
     ),
 );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php

@@ -30 +30 @@
         'name'  => 'captions',
         'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'video_caption_language', 'native' ),
+    ),
+    array(
+        'label' => __( 'WordPress Version', 'wporg-learn' ),
+        'name'  => 'wp_version',
+        'items' => get_terms( array(
+            'taxonomy' => 'wporg_wp_version',
+            'fields'   => 'id=>name',
+        ) ),
     ),
 );