Changeset 31153

Timestamp:

01/12/2015 12:19:34 AM (10 years ago)

Author:

pento

Message:

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.

See #21195

Location:

trunk

Files:

• src/wp-includes/link-template.php (modified) (2 diffs)
• tests/phpunit/tests/avatar.php (modified) (1 diff)

trunk/src/wp-includes/link-template.php

@@ -3389 +3389 @@
  *     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,
- *                                      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 bool   $found_avatar True if we were able to find an avatar for this user,
+ *                                false or not set if we couldn't.
+ *     @type string $url          The URL of the avatar we found.
  * }
  */
@@ -3548 +3548 @@
      * @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 );
-
-    // 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;
-}
+    return apply_filters( 'get_avatar_data', $args, $id_or_email );
+}

trunk/tests/phpunit/tests/avatar.php

@@ -99 +99 @@
     }
 
-    /**
-     * @ticket 21195
-     */
-    public function test_get_avatar_url_bad_id() {
-        $this->assertFalse( get_avatar_url( false ) );
-        $this->assertFalse( get_avatar_url( 100000 ) );
-    }
-
     protected $fakeURL;
     /**