WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Just pass the comment object to get_avatar in floated_admin_avatar rather than duplicating logic. Fixes #12291 props Otto42. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-02-25 22:19:03 +00:00
parent e667fb14e0
commit c7aa32c0ac
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/includes/comment.php
View File

@ -142,7 +142,7 @@ function get_pending_comments_num( $post_id ) {
/**
* Add avatars to relevant places in admin, or try to.
*
* @since unknown
* @since 2.5.0
* @uses $comment
*
* @param string $name User name.
@ -150,16 +150,7 @@ function get_pending_comments_num( $post_id ) {
*/
function floated_admin_avatar( $name ) {
global $comment;
$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 );
$avatar = get_avatar( $comment, 32 );
return "$avatar $name";
}