Changeset 9828 for trunk/src/bp-core/bp-core-admin.php

Timestamp:

05/02/2015 01:01:03 AM (9 years ago)

Author:

boonebgorges

Message:

Allow group avatars to be disabled.

Props xgz, boonebgorges, imath, hnla.
Fixes #4677.

File:

• trunk/src/bp-core/bp-core-admin.php (modified) (3 diffs)

trunk/src/bp-core/bp-core-admin.php

@@ -338 +338 @@
             add_settings_section( 'bp_xprofile', _x( 'Profile Settings', 'BuddyPress setting tab', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress' );
 
-            $avatar_setting = 'bp_xprofile';
+            add_settings_field( 'bp-disable-avatar-uploads', __( 'Profile Photo Uploads', 'buddypress' ), 'bp_admin_setting_callback_avatar_uploads', 'buddypress', 'bp_xprofile' );
+            register_setting( 'buddypress', 'bp-disable-avatar-uploads', 'intval' );
 
             // Profile sync setting
@@ -352 +353 @@
             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'                                                                                );
+
+            // Allow group avatars.
+            add_settings_field( 'bp-disable-group-avatar-uploads', __( 'Group Photo Uploads', 'buddypress' ), 'bp_admin_setting_callback_group_avatar_uploads', 'buddypress', 'bp_groups' );
+            register_setting( 'buddypress', 'bp-disable-group-avatar-uploads', 'intval' );
         }
 
@@ -393 +394 @@
                 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', __( 'Profile Photo Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
-            register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                    );
         }
     }