Changeset 10327

Timestamp:

09/30/2020 07:13:01 AM (5 years ago)

Author:

dd32

Message:

Make: Trac Components: Link to maintainers profiles properly when user_login != user_nicename.

Skips invalid logins entered in maintainers list, so it's more obvious when the incorrect data is added for a maintainer.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php

@@ -390 +390 @@
             echo '<ul class="maintainers">';
             foreach ( $maintainers as $maintainer ) {
+                $maintainer = get_user_by( 'login', $maintainer );
+                if ( ! $maintainer ) {
+                    continue;
+                }
+
                 printf( '<li><a href="//profiles.wordpress.org/%s">%s %s</a></li>',
-                    esc_attr( $maintainer ),
-                    get_avatar( get_user_by( 'login', $maintainer )->user_email, 36 ),
-                    $maintainer
+                    esc_attr( $maintainer->user_nicename ),
+                    get_avatar( $maintainer->user_email, 36 ),
+                    $maintainer->display_name ?: $maintainer->user_login
                 );
             }
@@ -718 +723 @@
         echo '<td class="no-grav maintainers">';
         foreach ( $maintainers as $maintainer ) {
-            echo '<a href="//profiles.wordpress.org/' . esc_attr( $maintainer ) . '" title="' . esc_attr( $maintainer ) . '">' . get_avatar( get_user_by( 'login', $maintainer )->user_email, 24 ) . "</a>";
+            $maintainer = get_user_by( 'login', $maintainer );
+            if ( ! $maintainer ) {
+                continue;
+            }
+
+            echo '<a href="//profiles.wordpress.org/' . esc_attr( $maintainer->user_nicename ) . '" title="' . esc_attr( $maintainer->display_name ) . '">' . get_avatar( $maintainer->user_email, 24 ) . "</a>";
         }
         echo '</td>';