Changeset 4620

Timestamp:

01/10/2017 08:33:47 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Sort the Contributors & Developers field in the order that it appears in the readme.

As we're storing contributors in a taxonomy, this requires switching the taxonomy to a sorted taxonomy, and using a lower-level terms function, although one which still has caching.

Fixes #2363

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• class-plugin-directory.php (modified) (1 diff)
• cli/class-import.php (modified) (2 diffs)
• shortcodes/class-developers.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -202 +202 @@
             'hierarchical'      => false,
             'query_var'         => 'plugin_contributor',
+            'sort'              => true,
             'rewrite'           => false,
             'labels'            => array(

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -133 +133 @@
 
         // Set categories if there aren't any yet. wp-admin takes precedent.
-        if ( ! wp_get_post_terms( $plugin->ID, 'plugin_category', array( 'fields' => 'ids' ) ) ) {
-            wp_set_post_terms( $plugin->ID, Tag_To_Category::map( $readme->tags ), 'plugin_category' );
+        if ( ! wp_get_object_terms( $plugin->ID, 'plugin_category', array( 'fields' => 'ids' ) ) ) {
+            wp_set_object_terms( $plugin->ID, Tag_To_Category::map( $readme->tags ), 'plugin_category' );
         }
 
         // Set tags from the readme
-        wp_set_post_terms( $plugin->ID, $readme->tags, 'plugin_tags' );
+        wp_set_object_terms( $plugin->ID, $readme->tags, 'plugin_tags' );
 
         // Update the contributors list
-        wp_set_post_terms( $plugin->ID, $readme->contributors, 'plugin_contributors' );
+        wp_set_object_terms( $plugin->ID, $readme->contributors, 'plugin_contributors' );
 
         // Update the committers list
@@ -147 +147 @@
 
         if ( in_array( 'adopt-me', $readme->tags ) ) {
-            wp_set_post_terms( $plugin->ID, array( 74 /* Term ID for adopt-me */ ), 'plugin_section' );
+            wp_set_object_terms( $plugin->ID, 'adopt-me', 'plugin_section' );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-developers.php

@@ -18 +18 @@
         $output = '';
 
-        if ( $contributors = get_the_terms( $post->ID, 'plugin_contributors' ) ) {
-            $contributors = wp_list_pluck( $contributors, 'name' );
-        } else {
+        $contributors = get_terms( array(
+            'taxonomy' => 'plugin_contributors',
+            'object_ids' => array( $post->ID ),
+            'orderby' => 'term_order',
+            'fields' => 'names',
+        ) );
+
+        if ( ! $contributors || is_wp_error( $contributors ) ) {
             $contributors = array();
             if ( $author = get_user_by( 'id', $post->post_author ) ) {
@@ -26 +31 @@
             }
         }
-        sort( $contributors, SORT_NATURAL );
 
         $output .= '<p>' . __( 'This is open source software. The following people have contributed to this plugin.', 'wporg-plugins' ) . '</p>';