Ticket #5345: 5345.02.patch

src/bp-groups/bp-groups-admin.php

@@ -1406 +1406 @@
                 $actions = apply_filters( 'bp_groups_admin_comment_row_actions', array_filter( $actions ), $item );
 
                 // Get group name and avatar
-                $avatar  = bp_core_fetch_avatar( array(
-                        'item_id'    => $item['id'],
-                        'object'     => 'group',
-                        'type'       => 'thumb',
-                        'avatar_dir' => 'group-avatars',
-                        'alt'        => sprintf( __( 'Group logo of %s', 'buddypress' ), $group_name ),
-                        'width'      => '32',
-                        'height'     => '32',
-                        'title'      => $group_name
-                ) );
+                $avatar = '';
+
+                if ( buddypress()->avatar->show_avatars ) {
+                        $avatar  = bp_core_fetch_avatar( array(
+                                'item_id'    => $item['id'],
+                                'object'     => 'group',
+                                'type'       => 'thumb',
+                                'avatar_dir' => 'group-avatars',
+                                'alt'        => sprintf( __( 'Group logo of %s', 'buddypress' ), $group_name ),
+                                'width'      => '32',
+                                'height'     => '32',
+                                'title'      => $group_name
+                        ) );
+                }
 
                 $content = sprintf( '<strong><a href="%s">%s</a></strong>', esc_url( $edit_url ), $group_name );
 

src/bp-groups/bp-groups-adminbar.php

@@ -57 +57 @@
         ) );
 
         // Group Admin > Group avatar
-        if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) {
+        if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) {
                 $wp_admin_bar->add_menu( array(
                         'parent' => $bp->group_admin_menu_id,
                         'id'     => 'group-avatar',

src/bp-groups/bp-groups-buddybar.php

@@ -35 +35 @@
 
                         <li><a href="<?php bp_groups_action_link( 'admin/group-settings' );  ?>"><?php _e( 'Group Settings', 'buddypress' ); ?></a></li>
 
-                        <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+                        <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) : ?>
 
                                 <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
 

src/bp-groups/bp-groups-loader.php

@@ -323 +323 @@
                 ) );
 
                 // If avatar uploads are not disabled, add avatar option
-                if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
+                if ( ! (int) $bp->site_options['bp-disable-avatar-uploads'] && $bp->avatar->show_avatars ) {
                         $this->group_creation_steps['group-avatar'] = array(
                                 'name'     => __( 'Avatar',   'buddypress' ),
                                 'position' => 20

src/bp-groups/bp-groups-screens.php

@@ -634 +634 @@
                 return false;
 
         // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here
-        if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) )
+        if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) || ! buddypress()->avatar->show_avatars )
                 return false;
 
         $bp = buddypress();

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

@@ -555 +555 @@
         function bp_get_group_avatar( $args = '' ) {
                 global $bp, $groups_template;
 
+                if ( ! buddypress()->avatar->show_avatars ) {
+                        return false;
+                }
+
                 $defaults = array(
                         'type'   => 'full',
                         'width'  => false,
@@ -1558 +1562 @@
 
         <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-settings' ) ?>"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
 
-        <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+        <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && buddypress()->avatar->show_avatars ) : ?>
 
                 <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
 
@@ -1708 +1712 @@
                 if ( empty( $group ) ) {
                         $group = $groups_template->group;
                 }
-        
+
                 if ( empty( $user_id ) ) {
                         $user_id = bp_loggedin_user_id();
                 }