Changeset 14396

Timestamp:

02/25/2025 03:45:29 AM (11 months ago)

Author:

dd32

Message:

Plugin Directory: Consistency show the plugin owner in the Contributor list for a plugin.

See ​https://make.wordpress.org/plugins/2025/02/20/plugin-author-now-linked-wp-profiles/

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-contributors.php (modified) (1 diff)

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

@@ -38 +38 @@
 
         if ( is_wp_error( $contributors ) ) {
-            return;
+            $contributors = [];
         }
 
-        if ( $contributors ) {
-            $contributors = array_map( function( $user_nicename ) {
-                return get_user_by( 'slug', $user_nicename );
-            }, $contributors );
-            $contributors = array_filter( $contributors );
+        // The owner of the plugin is always a contributor, and shown first.
+        $plugin_owner = get_the_author_meta( 'user_nicename', $post->post_author );
+        if ( $plugin_owner && 0 !== array_search( $plugin_owner, $contributors, true ) ) {
+            $contributors = array_unique(
+                array_merge(
+                    [ $plugin_owner ],
+                    $contributors
+                )
+            );
         }
 
-        // If no contributors were explicitly or properly listed, default to associated author.
-        if ( ! $contributors && ( $author = get_user_by( 'ID', $post->post_author ) ) ) {
-            $contributors = [ $author ];
-        }
+        // Convert the user_nicenames to user objects.
+        $contributors = array_map(
+            function( $user_nicename ) {
+                return get_user_by( 'slug', $user_nicename );
+            },
+            $contributors
+        );
+
+        // Remove any users that didn't exist.
+        $contributors = array_filter( $contributors );
 
         $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Contributors', 'wporg-plugins' ) : $instance['title'], $instance, $this->id_base );