Ticket #5549: 5549.02.patch

bp-xprofile/bp-xprofile-loader.php

@@ -215 +215 @@
                 }
 
                 // Privacy Settings
-                if ( bp_is_active( 'settings' ) ) {
+                // Only add this item for themes that are not bp-default
+                if ( bp_is_active( 'settings' ) && bp_use_theme_compat_with_current_theme() ) {
 
                         // Get the settings slug
                         $settings_slug = bp_get_settings_slug();
@@ -329 +330 @@
          * @return array
          */
         public function setup_settings_admin_nav( $wp_admin_nav ) {
+                // Don't add the "Settings > Profile" subnav item if on bp-default
+                if ( ! bp_use_theme_compat_with_current_theme() ) {
+                        return $wp_admin_nav;
+                }
+
                 // Setup the logged in user variables
                 $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );