Changeset 734

Timestamp:

07/01/2014 05:26:45 PM (11 years ago)

Author:

nacin

Message:

Trac Notifications/Components: Use get_avatar() rather than grav-redirect.

Location:

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

Files:

• trac-components.php (modified) (3 diffs)
• trac-notifications.php (modified) (1 diff)

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

@@ -172 +172 @@
 
     function the_content( $content ) {
+        global $wpdb;
+
         $post = get_post();
         if ( ! $this->page_is_component( $post ) ) {
@@ -242 +244 @@
             echo 'Component maintainers: ';
             echo '<ul class="maintainers">';
-            foreach ( $maintainers as $maintainer ) {
-                echo '<li><a href="//profiles.wordpress.org/' . esc_attr( $maintainer ) . '">';
-                echo '<img width="36" height="36" src="//wordpress.org/grav-redirect.php?user=' . esc_attr( $maintainer ) . '&amp;s=36" /></a> ' . $maintainer . '</li>';
+            foreach ( array_map( 'trim', explode( ',', $maintainers ) ) as $maintainer ) {
+                echo '<li><a href="//profiles.wordpress.org/' . esc_attr( $maintainer ) . '">' . get_avatar( get_user_by( 'login', $maintainer )->user_email, 36 ) . "</a> $maintainer</li>";
             }
             echo "</ul>\n\n";
@@ -253 +254 @@
 
         $followers = $this->trac->get_col( $this->trac->prepare( "SELECT username FROM _notifications WHERE type = 'component' AND value = %s", $post->post_title ) );
+        $followers = "'" . implode( "', '", esc_sql( $followers ) ) . "'";
+        $followers = $wpdb->get_results( "SELECT user_login, user_nicename, user_email FROM $wpdb->users WHERE user_login IN ($followers)" );
         if ( $followers ) {
-            echo 'Contributors following this component: ';
+            echo 'Contributors following this component:';
             echo '<ul class="followers">';
             foreach ( $followers as $follower ) {
-                $follower = esc_attr( $follower );
-                echo '<li><a title="' . $follower . '" href="//profiles.wordpress.org/' . $follower . '">';
-                echo '<img width="36" height="36" src="//wordpress.org/grav-redirect.php?user=' . $follower . '&amp;s=36" /></a></li>';
+                echo '<li><a title="' . esc_attr( $follower->user_login ) . '" href="//profiles.wordpress.org/' . esc_attr( $follower->user_nicename ) . '">';
+                echo get_avatar( $follower->user_email, 36 ) . '</a></li>';
             }
             echo '</ul>';

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

@@ -344 +344 @@
                     ?>
                         <a<?php echo $class; ?> title="<?php echo $follower; ?>" href="//profiles.wordpress.org/<?php echo $follower; ?>">
-                            <img width="36" height="36" src="//wordpress.org/grav-redirect.php?user=<?php echo $follower; ?>&amp;s=36" />
+                            <?php echo get_avatar( get_user_by( 'login', $follower )->user_email, 36 ); ?>
                             <span class="username"><?php echo $follower; ?></span>
                         </a>
                     <?php endforeach; ?>
                     <a title="you" class="star-you" href="//profiles.wordpress.org/<?php echo esc_attr( $username ); ?>">
-                        <img width="36" height="36" src="//wordpress.org/grav-redirect.php?user=<?php echo esc_attr( $username ); ?>&amp;s=36" />
+                        <?php echo get_avatar( wp_get_current_user()->user_email, 36 ); ?>
                         <span class="username"><?php echo $username; ?></span>
                     </a>