sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In get_avatar_data(), there's no need to return false if we couldn't find an avatar, as Gravatar can handle being given an empty email hash. This allows the default avatar to show when no email address is given.

Browse Source 
See #21195



git-svn-id: https://develop.svn.wordpress.org/trunk@31153 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2015-01-12 00:19:34 +00:00
parent d0fab598e7
commit 69f8b26d89
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wp-includes/link-template.php
View File

@ -3388,9 +3388,9 @@ function get_avatar_url( $id_or_email, $args = null ) {
* @return array $processed_args { * @return array $processed_args {
* Along with the arguments passed in $args, this will contain a couple of extra arguments. * Along with the arguments passed in $args, this will contain a couple of extra arguments.
* *
* @type bool $found_avatar True if we were able to find an avatar for this user, * @type bool $found_avatar True if we were able to find an avatar for this user,
* false or not set if we couldn't. * false or not set if we couldn't.
* @type false|string $url The URL of the avatar we found, or false if we couldn't find an avatar. * @type string $url The URL of the avatar we found.
* } * }
*/ */
function get_avatar_data( $id_or_email, $args = null ) { function get_avatar_data( $id_or_email, $args = null ) {
@ -3547,12 +3547,5 @@ function get_avatar_data( $id_or_email, $args = null ) {
* @param array $args Arguments passed to get_avatar_data(), after processing. * @param array $args Arguments passed to get_avatar_data(), after processing.
* @param int|object|string $id_or_email A user ID, email address, or comment object. * @param int|object|string $id_or_email A user ID, email address, or comment object.
*/ */
$args = apply_filters( 'get_avatar_data', $args, $id_or_email ); return apply_filters( 'get_avatar_data', $args, $id_or_email );
// Don't return a broken URL if we couldn't find the email hash, and none of the filters returned a different URL.
if ( ! $email_hash && $url === $args['url'] ) {
$args['url'] = false;
}
return $args;
} }

8
tests/phpunit/tests/avatar.php
View File

@ -98,14 +98,6 @@ class Tests_Avatar extends WP_UnitTestCase {
$this->assertEquals( $url, $url2 ); $this->assertEquals( $url, $url2 );
} }
/**
* @ticket 21195
*/
public function test_get_avatar_url_bad_id() {
$this->assertFalse( get_avatar_url( false ) );
$this->assertFalse( get_avatar_url( 100000 ) );
}
protected $fakeURL; protected $fakeURL;
/** /**
* @ticket 21195 * @ticket 21195