Changeset 5762

Timestamp:

02/13/2012 08:02:41 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Move bp_get_user_has_avatar() into bp-core-avatars.php and add comparison to bp_core_avatar_default(). Fixes #3977. Props r-a-y, paulgibbs.

Location:

trunk

Files:

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

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

@@ -796 +796 @@
 
 /**
+ * Check if a given user ID has an uploaded avatar
+ *
+ * @since BuddyPress (1.0)
+ * @param int $user_id
+ * @return boolean
+ */
+function bp_get_user_has_avatar( $user_id = 0 ) {
+
+    if ( empty( $user_id ) )
+        $user_id = bp_displayed_user_id();
+
+    $retval = false;
+    if ( bp_core_fetch_avatar( array( 'item_id' => $user_id, 'no_grav' => true, 'html' => false ) ) != bp_core_avatar_default() )
+        $retval = true;
+
+    return (bool) apply_filters( 'bp_get_user_has_avatar', $retval, $user_id );
+}
+
+/**
  * Utility function for fetching an avatar dimension setting
  *

trunk/bp-xprofile/bp-xprofile-template.php

@@ -825 +825 @@
     }
 
-function bp_get_user_has_avatar() {
-
-    if ( !bp_core_fetch_avatar( array( 'item_id' => bp_displayed_user_id(), 'no_grav' => true ) ) )
-        return false;
-
-    return true;
-}
-
 function bp_edit_profile_button() {
     global $bp;