Changeset 7743 for trunk/bp-core/bp-core-admin.php

Timestamp:

01/20/2014 09:43:10 PM (11 years ago)

Author:

imath

Message:

Makes group avatars not dependant of xprofile component settings

Avatar uploads setting is by default attached to xprofile settings. In case this component is disable and groups component is active, the avatar uploads setting will be attached to groups in order to keep on allowing avatar uploads for groups.

Fixes #5330

File:

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

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

@@ -286 +286 @@
             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
@@ -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
@@ -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'                                                                                    );
         }
     }