Ticket #6377: 6377.patch

src/bp-xprofile/bp-xprofile-admin.php

@@ -690 +690 @@
          * @since BuddyPress (2.3.0)
          */
         public function enqueue_scripts( $screen_id ) {
-                if ( ( false === strpos( $screen_id, 'users_page_bp-profile-edit' ) && false === strpos( $screen_id, 'profile_page_bp-profile-edit' ) ) || bp_core_get_root_option( 'bp-disable-avatar-uploads' ) ) {
+                if ( ( false === strpos( $screen_id, 'users_page_bp-profile-edit' ) && false === strpos( $screen_id, 'profile_page_bp-profile-edit' ) ) || bp_core_get_root_option( 'bp-disable-avatar-uploads' ) || ! buddypress()->avatar->show_avatars ) {
                         return;
                 }
 
@@ -768 +768 @@
                         );
                 }
 
-                // Avatar Metabox
-                add_meta_box(
-                        'bp_xprofile_user_admin_avatar',
-                        _x( 'Profile Photo', 'xprofile user-admin edit screen', 'buddypress' ),
-                        array( $this, 'user_admin_avatar_metabox' ),
-                        $screen_id,
-                        'side',
-                        'low'
-                );
+                if ( buddypress()->avatar->show_avatars ) {
+                        // Avatar Metabox
+                        add_meta_box(
+                                'bp_xprofile_user_admin_avatar',
+                                _x( 'Profile Photo', 'xprofile user-admin edit screen', 'buddypress' ),
+                                array( $this, 'user_admin_avatar_metabox' ),
+                                $screen_id,
+                                'side',
+                                'low'
+                        );
+                }
         }
 
         /**