Changeset 9775

Timestamp:

04/20/2015 04:37:57 PM (10 years ago)

Author:

imath

Message:

In wp-admin/extended profile, do not display the avatar metabox if the "Show avatars" WordPress setting is not active.

Fixes #6377

File:

• trunk/src/bp-xprofile/bp-xprofile-admin.php (modified) (2 diffs)

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

@@ -691 +691 @@
      */
     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;
         }
@@ -769 +769 @@
         }
 
-        // 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'
+            );
+        }
     }