Ticket #5343: 5343.diff

bp-groups/bp-groups-loader.php

@@ -591 +591 @@
                                 ) );
 
                                 if ( empty( $bp->bp_options_avatar ) ) {
-                                        $bp->bp_options_avatar = bp_group_current_avatar();
+                                        $bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Avatar', 'buddypress' ) . '" class="avatar" />';
                                 }
                         }
                 }

bp-groups/bp-groups-template.php

@@ -2626 +2626 @@
  * Group Avatar Template Tags
  **/
 
-function bp_group_current_avatar() {
-        global $bp;
+function bp_group_current_avatar( $type = 'thumb' ) {
+        echo bp_get_group_current_avatar( $type );
+}
 
-        if ( $bp->groups->current_group->avatar_full ) { ?>
+        function bp_get_group_current_avatar( $type = 'thumb' ) {
 
-                <img src="<?php echo esc_url( $bp->groups->current_group->avatar_full ); ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
+                $group_avatar = bp_core_fetch_avatar( array( 
+                        'item_id' => bp_get_current_group_id(), 
+                        'object' => 'group', 
+                        'type' => $type, 
+                        'avatar_dir' => 'group-avatars', 
+                        'alt' => __( 'Group avatar', 'buddypress' ),
+                        'class' => 'avatar' 
+                ) );
 
-        <?php } else { ?>
+                return apply_filters( 'bp_get_group_current_avatar', $group_avatar );
+        }
 
-                <img src="<?php echo esc_url( $bp->groups->image_base . '/none.gif' ); ?>" alt="<?php _e( 'No Group Avatar', 'buddypress' ) ?>" class="avatar" />
-
-        <?php }
-}
-
 function bp_get_group_has_avatar() {
         global $bp;