Ticket #3652: 3652.01.patch

bp-core/bp-core-buddybar.php

@@ -62 +62 @@
         if ( ( -1 != $position ) && bp_is_root_component( $slug ) && !bp_displayed_user_id() )
                 return;
 
+        do_action( 'bp_core_nav_default', $slug );
+        
+        extract( $bp->bp_nav[$slug] ); 
+
         // Look for current component
         if ( bp_is_current_component( $slug ) && !bp_current_action() ) {
                 if ( !is_object( $screen_function[0] ) )
@@ -78 +82 @@
                         if ( apply_filters( 'bp_guarantee_unique_uris', true ) ) {
                                 bp_core_redirect( bp_displayed_user_domain() . $slug . '/' . apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r ) );
                         } else {
-                                 $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
+                                $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
                         }
                 }
 
@@ -124 +128 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
 
-        if ( $function = $bp->bp_nav[$parent_slug]['screen_function'] ) {
-                if ( !is_object( $function[0] ) )
-                        remove_action( 'bp_screens', $function, 3 );
-                else
-                        remove_action( 'bp_screens', array( &$function[0], $function[1] ), 3 );
-        }
-
-        $bp->bp_nav[$parent_slug]['screen_function'] = &$screen_function;
-
-        if ( $bp->current_component == $parent_slug && !$bp->current_action ) {
-                if ( !is_object( $screen_function[0] ) )
-                        add_action( 'bp_screens', $screen_function );
-                else
-                        add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
+        $bp->nav_default_resets[$parent_slug] = $r;
+}
 
-                if ( $subnav_slug )
-                        $bp->current_action = $subnav_slug;
+/**
+ * Checks to see whether the subnav default has been changed by a plugin before redirecting to
+ * the default.
+ *
+ * @since 1.6
+ * @see bp_core_new_nav_default(), where $bp->nav_default_resets is populated
+ * @see bp_core_new_nav_item(), where the bp_core_nav_default hook is located
+ *
+ * @param str $slug The parent nav slug being modified
+ */
+function bp_core_reset_nav_default( $slug ) {
+        global $bp;
+        
+        if ( isset( $bp->bp_nav[$slug] ) && isset( $bp->nav_default_resets[$slug] ) ) {
+                $bp->bp_nav[$slug]['screen_function'] = $bp->nav_default_resets[$slug]['screen_function'];
+                $bp->bp_nav[$slug]['default_subnav_slug'] = $bp->nav_default_resets[$slug]['subnav_slug'];
         }
 }
+add_action( 'bp_core_nav_default', 'bp_core_reset_nav_default' );
 
 /**
  * We can only sort nav items by their position integer at a later point in time, once all