Ticket #2152: 2152.01.patch

src/bp-groups/bp-groups-template.php

@@ -781 +781 @@
                         return false;
                 }
 
+                // If not in group loop, 
+                $group = ! empty( $groups_template->group )
+                        ? $groups_template->group
+                        : groups_get_current_group();
+
+                // If no group, provide some sane defaults to mask developer error
+                if ( empty( $group ) ) {
+                        $group = (object) array(
+                                'name'         => __( 'Unknown Group', 'buddypress' ),
+                                'id'           => 0,
+                                'avatar_full'  => bp_core_avatar_default(),
+                                'avatar_thumb' => bp_core_avatar_default_thumb()
+                        );
+                }
+
                 // Parse the arguments
                 $r = bp_parse_args( $args, array(
                         'type'   => 'full',
@@ -788 +803 @@
                         'height' => false,
                         'class'  => 'avatar',
                         'id'     => false,
-                        'alt'    => sprintf( __( 'Group logo of %s', 'buddypress' ), $groups_template->group->name )
+                        'alt'    => sprintf( __( 'Group logo of %s', 'buddypress' ), $group->name )
                 ) );
 
                 // Fetch the avatar from the folder
                 $avatar = bp_core_fetch_avatar( array(
-                        'item_id'    => $groups_template->group->id,
-                        'title'      => $groups_template->group->name,
+                        'item_id'    => $group->id,
+                        'title'      => $group->name,
                         'avatar_dir' => 'group-avatars',
                         'object'     => 'group',
                         'type'       => $r['type'],
@@ -807 +822 @@
 
                 // If No avatar found, provide some backwards compatibility
                 if ( empty( $avatar ) ) {
-                        $avatar = '<img src="' . esc_url( $groups_template->group->avatar_thumb ) . '" class="avatar" alt="' . esc_attr( $groups_template->group->name ) . '" />';
+                        $avatar = '<img src="' . esc_url( $group->avatar_thumb ) . '" class="avatar" alt="' . esc_attr( $group->name ) . '" />';
                 }
 
                 return apply_filters( 'bp_get_group_avatar', $avatar, $r );