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

Fall back to comment author email in get_avatar() if the user who left the comment no longer exists. 

props mauryaratan, lite3.
fixes #25803.
Built from https://develop.svn.wordpress.org/trunk@26000


git-svn-id: http://core.svn.wordpress.org/trunk@25933 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2013-11-02 12:20:11 +00:00
parent e0e2ace724
commit 40391f4e37
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/pluggable.php
View File

@ -1645,14 +1645,15 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) {
if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) )
return false; return false;
if ( !empty($id_or_email->user_id) ) { if ( ! empty( $id_or_email->user_id ) ) {
$id = (int) $id_or_email->user_id; $id = (int) $id_or_email->user_id;
$user = get_userdata($id); $user = get_userdata($id);
if ( $user) if ( $user )
$email = $user->user_email; $email = $user->user_email;
} elseif ( !empty($id_or_email->comment_author_email) ) {
$email = $id_or_email->comment_author_email;
} }
if ( ! $email && ! empty( $id_or_email->comment_author_email ) )
$email = $id_or_email->comment_author_email;
} else { } else {
$email = $id_or_email; $email = $id_or_email;
} }