Changeset 8244

Timestamp:

04/06/2014 04:20:35 PM (10 years ago)

Author:

boonebgorges

Message:

Allow bp_get_group_has_avatar() to accept a group_id param

Also fix some logic that was causing the function to return true when the
group avatar matched the default avatar (meaning that no local avatar had been
uploaded). See r7769

Fixes #5380

Props imath

Location:

trunk

Files:

• bp-groups/bp-groups-template.php (modified) (1 diff)
• tests/testcases/groups/avatars.php (added)

trunk/bp-groups/bp-groups-template.php

@@ -2901 +2901 @@
     }
 
-function bp_get_group_has_avatar() {
+function bp_get_group_has_avatar( $group_id = false ) {
     global $bp;
 
-    if ( !empty( $_FILES ) || !bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'no_grav' => true ) ) )
+    if ( false === $group_id ) {
+        $group_id = bp_get_current_group_id();
+    }
+
+    // Todo - this looks like an overgeneral check
+    if ( ! empty( $_FILES ) ) {
         return false;
+    }
+
+    $group_avatar = bp_core_fetch_avatar( array(
+        'item_id' => $group_id,
+        'object' => 'group',
+        'no_grav' => true,
+        'html' => false,
+    ) );
+
+    if ( bp_core_avatar_default( 'local' ) === $group_avatar ) {
+        return false;
+    }
 
     return true;