<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[734] sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications: Trac Notifications/Components: Use get_avatar() rather than grav-redirect.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/734">734</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-07-01 17:26:45 +0000 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trac Notifications/Components: Use get_avatar() rather than grav-redirect.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginstracnotificationstraccomponentsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginstracnotificationstracnotificationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginstracnotificationstraccomponentsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php (733 => 734)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php 2014-07-01 16:37:08 UTC (rev 733)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php 2014-07-01 17:26:45 UTC (rev 734)
</span><span class="lines">@@ -171,6 +171,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function the_content( $content ) {
</span><ins>+ global $wpdb;
+
</ins><span class="cx"> $post = get_post();
</span><span class="cx"> if ( ! $this->page_is_component( $post ) ) {
</span><span class="cx"> return $content;
</span><span class="lines">@@ -241,9 +243,8 @@
</span><span class="cx"> $maintainers = array_map( 'trim', explode( ',', $maintainers ) );
</span><span class="cx"> echo 'Component maintainers: ';
</span><span class="cx"> echo '<ul class="maintainers">';
</span><del>- 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 ) . '&s=36" /></a> ' . $maintainer . '</li>';
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> echo "</ul>\n\n";
</span><span class="cx"> }
</span><span class="lines">@@ -252,13 +253,14 @@
</span><span class="cx"> echo "<strong>Want to help? Start following this component!</strong> <a href='/core/notifications/'>Adjust your notifications here</a>. Feel free to dig into any ticket." . "\n\n";
</span><span class="cx">
</span><span class="cx"> $followers = $this->trac->get_col( $this->trac->prepare( "SELECT username FROM _notifications WHERE type = 'component' AND value = %s", $post->post_title ) );
</span><ins>+ $followers = "'" . implode( "', '", esc_sql( $followers ) ) . "'";
+ $followers = $wpdb->get_results( "SELECT user_login, user_nicename, user_email FROM $wpdb->users WHERE user_login IN ($followers)" );
</ins><span class="cx"> if ( $followers ) {
</span><del>- echo 'Contributors following this component: ';
</del><ins>+ echo 'Contributors following this component:';
</ins><span class="cx"> echo '<ul class="followers">';
</span><span class="cx"> foreach ( $followers as $follower ) {
</span><del>- $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 . '&s=36" /></a></li>';
</del><ins>+ 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>';
</ins><span class="cx"> }
</span><span class="cx"> echo '</ul>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginstracnotificationstracnotificationsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications.php (733 => 734)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications.php 2014-07-01 16:37:08 UTC (rev 733)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications.php 2014-07-01 17:26:45 UTC (rev 734)
</span><span class="lines">@@ -343,12 +343,12 @@
</span><span class="cx"> $class = ''; // in_array( $follower, $stars, true ) ? ' class="star"' : '';
</span><span class="cx"> ?>
</span><span class="cx"> <a<?php echo $class; ?> title="<?php echo $follower; ?>" href="//profiles.wordpress.org/<?php echo $follower; ?>">
</span><del>- <img width="36" height="36" src="//wordpress.org/grav-redirect.php?user=<?php echo $follower; ?>&s=36" />
</del><ins>+ <?php echo get_avatar( get_user_by( 'login', $follower )->user_email, 36 ); ?>
</ins><span class="cx"> <span class="username"><?php echo $follower; ?></span>
</span><span class="cx"> </a>
</span><span class="cx"> <?php endforeach; ?>
</span><span class="cx"> <a title="you" class="star-you" href="//profiles.wordpress.org/<?php echo esc_attr( $username ); ?>">
</span><del>- <img width="36" height="36" src="//wordpress.org/grav-redirect.php?user=<?php echo esc_attr( $username ); ?>&s=36" />
</del><ins>+ <?php echo get_avatar( wp_get_current_user()->user_email, 36 ); ?>
</ins><span class="cx"> <span class="username"><?php echo $username; ?></span>
</span><span class="cx"> </a>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>