Ticket #40030: pass_object_to_rest_get_avatar_urls.40030.diff

src/wp-includes/rest-api.php

@@ -1085 +1085 @@
 }
 
 /**
- * Retrieves the avatar urls in various sizes based on a given email address.
+ * Retrieves the avatar urls in various sizes.
  *
  * @since 4.7.0
  *
  * @see get_avatar_url()
  *
- * @param string $email Email address.
+ * @param mixed $id_or_email The Gravatar to retrieve a URL for. Accepts a user_id, gravatar md5 hash,
+ *                           user email, WP_User object, WP_Post object, or WP_Comment object.
  * @return array $urls Gravatar url for each size.
  */
-function rest_get_avatar_urls( $email ) {
+function rest_get_avatar_urls( $id_or_email ) {
         $avatar_sizes = rest_get_avatar_sizes();
 
         $urls = array();
         foreach ( $avatar_sizes as $size ) {
-                $urls[ $size ] = get_avatar_url( $email, array( 'size' => $size ) );
+                $urls[ $size ] = get_avatar_url( $id_or_email, array( 'size' => $size ) );
         }
 
         return $urls;

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -949 +949 @@
                 }
 
                 if ( in_array( 'author_avatar_urls', $fields, true ) ) {
-                        $data['author_avatar_urls'] = rest_get_avatar_urls( $comment->comment_author_email );
+                        $data['author_avatar_urls'] = rest_get_avatar_urls( $comment );
                 }
 
                 if ( in_array( 'meta', $fields, true ) ) {

src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

@@ -938 +938 @@
                 }
 
                 if ( in_array( 'avatar_urls', $fields, true ) ) {
-                        $data['avatar_urls'] = rest_get_avatar_urls( $user->user_email );
+                        $data['avatar_urls'] = rest_get_avatar_urls( $user );
                 }
 
                 if ( in_array( 'meta', $fields, true ) ) {