Ticket #29274: 29274.diff

src/wp-admin/includes/plugin-install.php

@@ -324 +324 @@
         $api = plugins_api( 'plugin_information', array(
                 'slug' => wp_unslash( $_REQUEST['plugin'] ),
                 'is_ssl' => is_ssl(),
-                'fields' => array( 'banners' => true, 'reviews' => true )
+                'fields' => array( 'banners' => true, 'reviews' => true, 'contributors' => true )
         ) );
 
         if ( is_wp_error( $api ) ) {
@@ -470 +470 @@
                         <h3><?php _e( 'Contributors' ); ?></h3>
                         <ul class="contributors">
                                 <?php
-                                foreach ( (array) $api->contributors as $contrib_username => $contrib_profile ) {
-                                        if ( empty( $contrib_username ) && empty( $contrib_profile ) ) {
-                                                continue;
+                                foreach ( (array) $api->contributors as $contrib_username => $contrib ) {
+                                        $contrib_username = sanitize_user( $contrib_username );
+                                        echo '<li>';
+                                        if ( $contrib['profile'] ) {
+                                                echo '<a href="' . esc_url( $contrib['profile'] ) . '" target="_blank">';
                                         }
-                                        if ( empty( $contrib_username ) ) {
-                                                $contrib_username = preg_replace( '/^.+\/(.+)\/?$/', '\1', $contrib_profile );
+                                        echo "<img src='" . esc_url( $contrib['avatar'] . '&s=36' ) . "' width='18' height='18' />{$contrib_username}";
+                                        if ( $contrib['profile'] ) {
+                                                echo '</a>';
                                         }
-                                        $contrib_username = sanitize_user( $contrib_username );
-                                        if ( empty( $contrib_profile ) ) {
-                                                echo "<li><img src='https://wordpress.org/grav-redirect.php?user={$contrib_username}&amp;s=36' width='18' height='18' />{$contrib_username}</li>";
-                                        } else {
-                                                echo "<li><a href='{$contrib_profile}' target='_blank'><img src='https://wordpress.org/grav-redirect.php?user={$contrib_username}&amp;s=36' width='18' height='18' />{$contrib_username}</a></li>";
-                                        }
+                                        echo '</li>';
                                 }
                                 ?>
                         </ul>