Changeset 6945

Timestamp:

02/20/2008 08:57:21 PM (17 years ago)

Author:

ryan

Message:

Allow comment object to be passed to get_avatar() for convenience. see #5775

File:

• trunk/wp-includes/pluggable.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -1187 +1187 @@
         return false;
 
+    $email = '';
     if ( is_numeric($id_or_email) ) {
         $id = (int) $id_or_email;
         $user = get_userdata($id);
-        if ( !$user)
-            $email = '';
-        else
+        if ( $user )
             $email = $user->user_email;
+    } elseif ( is_object($id_or_email) ) {
+        if ( !empty($id_or_email->user_id) ) {
+            $id = (int) $id_or_email->user_id;
+            $user = get_userdata();
+            if ( $user)
+                $email = $user->user_email;
+        } elseif ( !empty($id_or_email->comment_author_email) ) {
+            $email = $id_or_email->comment_author_email;
+        }
     } else {
         $email = $id_or_email;