Changeset 5924

Timestamp:

09/14/2017 12:21:08 AM (7 years ago)

Author:

dd32

Message:

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

This was previously fixed in [4620] for one location, which was later changed. This updates the other two locations which were originally missed.

Fixes #2363.

Location:

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

Files:

• api/routes/class-plugin.php (modified) (1 diff)
• widgets/class-contributors.php (modified) (1 diff)

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

@@ -77 +77 @@
         $result['contributors'] = array();
 
-        if ( $contributors = get_the_terms( $post->ID, 'plugin_contributors' ) ) {
-            $contributors = wp_list_pluck( $contributors, 'slug' );
-        } else {
+        $contributors = get_terms( array(
+            'taxonomy' => 'plugin_contributors',
+            'object_ids' => array( $post->ID ),
+            'orderby' => 'term_order',
+            'fields' => 'names',
+        ) );
+
+        if ( is_wp_error( $contributors ) ) {
+            $contributors = array();
+        }
+
+        if ( ! $contributors ) {
             $contributors = array();
             if ( $author = get_user_by( 'id', $post->post_author ) ) {

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

@@ -28 +28 @@
     public function widget( $args, $instance ) {
         $post = get_post();
-        $contributors = get_the_terms( $post, 'plugin_contributors' );
+
+        $contributors = get_terms( array(
+            'taxonomy' => 'plugin_contributors',
+            'object_ids' => array( $post->ID ),
+            'orderby' => 'term_order',
+            'fields' => 'names',
+        ) );
+
+        if ( is_wp_error( $contributors ) ) {
+            return;
+        }
 
         if ( $contributors ) {
-            $contributors = (array) wp_list_pluck( $contributors, 'name' );
             $contributors = array_map( function( $user_nicename ) {
                 return get_user_by( 'slug', $user_nicename );