Changeset 2417

Timestamp:

01/24/2010 01:21:39 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1681

File:

• trunk/bp-core/bp-core-avatars.php (modified) (1 diff)

trunk/bp-core/bp-core-avatars.php

@@ -340 +340 @@
 
 // Override internal "get_avatar()" function to use our own where possible
-function bp_core_fetch_avatar_filter( $avatar, $id_or_email, $size, $default, $alt ) {
+function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt ) {
     global $authordata;
 
-    $bp_avatar = bp_core_fetch_avatar( array( 'item_id' => $authordata->ID, 'width' => $size, 'height' => $size, 'alt' => $alt ) );
+    if ( is_object( $user ) )
+        $id = $user->user_id;
+    else if ( is_numeric( $user ) )
+        $id = $user;
+    else
+        $id = $authordata->ID;
+
+    if ( empty( $user ) )
+        return $avatar;
+
+    $bp_avatar = bp_core_fetch_avatar( array( 'item_id' => $id, 'width' => $size, 'height' => $size, 'alt' => $alt ) );
 
     return ( !$bp_avatar ) ? $avatar : $bp_avatar;