Ticket #5330: 5330.diff

bp-core/bp-core-admin.php

@@ -285 +285 @@
                         // Add the main section
                         add_settings_section( 'bp_xprofile',      __( 'Profile Settings', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress'                );
 
-                        // Allow avatar uploads
-                        add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', 'bp_xprofile' );
-                        register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                  );
+                        $avatar_setting = 'bp_xprofile';
 
                         // Profile sync setting
                         add_settings_field( 'bp-disable-profile-sync',   __( 'Profile Syncing',  'buddypress' ), 'bp_admin_setting_callback_profile_sync',     'buddypress', 'bp_xprofile' );
@@ -301 +299 @@
                         // Add the main section
                         add_settings_section( 'bp_groups',        __( 'Groups Settings',  'buddypress' ), 'bp_admin_setting_callback_groups_section',   'buddypress'              );
 
+                        if( empty( $avatar_setting ) )
+                                $avatar_setting = 'bp_groups';
+
                         // Allow subscriptions setting
                         add_settings_field( 'bp_restrict_group_creation', __( 'Group Creation',   'buddypress' ), 'bp_admin_setting_callback_group_creation',   'buddypress', 'bp_groups' );
                         register_setting  ( 'buddypress',         'bp_restrict_group_creation',   'intval'                                                                                );
@@ -335 +336 @@
                                 register_setting  ( 'buddypress',         '_bp_enable_akismet',   'intval'                                                                                  );
                         }
                 }
+
+                /** Avatar upload for users or groups **/
+                if( !empty( $avatar_setting ) ) {
+                        // Allow avatar uploads
+                        add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
+                        register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                    );
+                }
         }
 
         /**