<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13420] trunk/wp-admin/includes/comment.php:
Just pass the comment object to get_avatar in floated_admin_avatar rather than duplicating logic
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13420">13420</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-02-25 22:19:03 +0000 (Thu, 25 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Just pass the comment object to get_avatar in floated_admin_avatar rather than duplicating logic. Fixes <a href="http://trac.wordpress.org/ticket/12291">#12291</a> props Otto42.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludescommentphp">trunk/wp-admin/includes/comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/comment.php (13419 => 13420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/comment.php 2010-02-25 22:11:54 UTC (rev 13419)
+++ trunk/wp-admin/includes/comment.php 2010-02-25 22:19:03 UTC (rev 13420)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Add avatars to relevant places in admin, or try to.
</span><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.5.0
</ins><span class="cx"> * @uses $comment
</span><span class="cx"> *
</span><span class="cx"> * @param string $name User name.
</span><span class="lines">@@ -150,16 +150,7 @@
</span><span class="cx"> */
</span><span class="cx"> function floated_admin_avatar( $name ) {
</span><span class="cx"> global $comment;
</span><del>-
- $id = $avatar = false;
- if ( $comment->comment_author_email )
- $id = $comment->comment_author_email;
- if ( $comment->user_id )
- $id = $comment->user_id;
-
- if ( $id )
- $avatar = get_avatar( $id, 32 );
-
</del><ins>+ $avatar = get_avatar( $comment, 32 );
</ins><span class="cx"> return "$avatar $name";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>