Ticket #5346: 5346.01.diff

bp-members/bp-members-adminbar.php

@@ -92 +92 @@
                 'href'  => bp_displayed_user_domain()
         ) );
 
-        if( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'xprofile' ) ) {
                 // User Admin > Edit this user's profile
                 $wp_admin_bar->add_menu( array(
                         'parent' => $bp->user_admin_menu_id,
@@ -102 +102 @@
                 ) );
 
                 // User Admin > Edit this user's avatar
-                $wp_admin_bar->add_menu( array(
-                        'parent' => $bp->user_admin_menu_id,
-                        'id'     => $bp->user_admin_menu_id . '-change-avatar',
-                        'title'  => __( "Edit Avatar", 'buddypress' ),
-                        'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
-                ) );
+                if ( buddypress()->avatar->show_avatars ) {
+                        $wp_admin_bar->add_menu( array(
+                                'parent' => $bp->user_admin_menu_id,
+                                'id'     => $bp->user_admin_menu_id . '-change-avatar',
+                                'title'  => __( "Edit Avatar", 'buddypress' ),
+                                'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
+                        ) );
+                }
+
         }
 
         if ( bp_is_active( 'settings' ) ) {

bp-xprofile/bp-xprofile-loader.php

@@ -200 +200 @@
                 );
 
                 // Change Avatar
-                $sub_nav[] = array(
-                        'name'            => __( 'Change Avatar', 'buddypress' ),
-                        'slug'            => 'change-avatar',
-                        'parent_url'      => $profile_link,
-                        'parent_slug'     => $this->slug,
-                        'screen_function' => 'xprofile_screen_change_avatar',
-                        'position'        => 30,
-                        'user_has_access' => bp_core_can_edit_settings()
-                );
+                if ( buddypress()->avatar->show_avatars ) {
+                        $sub_nav[] = array(
+                                'name'            => __( 'Change Avatar', 'buddypress' ),
+                                'slug'            => 'change-avatar',
+                                'parent_url'      => $profile_link,
+                                'parent_slug'     => $this->slug,
+                                'screen_function' => 'xprofile_screen_change_avatar',
+                                'position'        => 30,
+                                'user_has_access' => bp_core_can_edit_settings()
+                        );
+                }
 
                 parent::setup_nav( $main_nav, $sub_nav );
         }
@@ -252 +254 @@
                                 'href'   => trailingslashit( $profile_link . 'edit' )
                         );
 
-                        // Edit Profile
-                        $wp_admin_nav[] = array(
-                                'parent' => 'my-account-' . $this->id,
-                                'id'     => 'my-account-' . $this->id . '-change-avatar',
-                                'title'  => __( 'Change Avatar', 'buddypress' ),
-                                'href'   => trailingslashit( $profile_link . 'change-avatar' )
-                        );
+                        // Edit Avatar
+                        if ( buddypress()->avatar->show_avatars ) {
+                                $wp_admin_nav[] = array(
+                                        'parent' => 'my-account-' . $this->id,
+                                        'id'     => 'my-account-' . $this->id . '-change-avatar',
+                                        'title'  => __( 'Change Avatar', 'buddypress' ),
+                                        'href'   => trailingslashit( $profile_link . 'change-avatar' )
+                                );
+                        }
 
                 }