Ticket #5380: 5380.01.diff

bp-core/bp-core-avatars.php

@@ -1033 +1033 @@
                 $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() )
+        if ( bp_core_fetch_avatar( array( 'item_id' => $user_id, 'no_grav' => true, 'html' => false ) ) != bp_core_avatar_default( 'local' ) )
                 $retval = true;
 
         return (bool) apply_filters( 'bp_get_user_has_avatar', $retval, $user_id );

bp-groups/bp-groups-template.php

@@ -2872 +2872 @@
                 return apply_filters( 'bp_get_group_current_avatar', $group_avatar );
         }
 
-function bp_get_group_has_avatar() {
-        global $bp;
+function bp_get_group_has_avatar( $group_id = null ) {
 
-        if ( !empty( $_FILES ) || !bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'no_grav' => true ) ) )
+        if ( empty( $group_id ) ) {
+                $group_id = buddypress()->groups->current_group->id;
+        }
+
+        if ( ! empty( $_FILES ) || bp_core_avatar_default( 'local' ) == bp_core_fetch_avatar( array( 'item_id' => $group_id, 'object' => 'group', 'no_grav' => true, 'html' => false ) ) )
                 return false;
 
         return true;