Changeset 5559

Timestamp:

12/16/2011 03:35:54 PM (13 years ago)

Author:

boonebgorges

Message:

Fixes bp_core_new_nav_default() to work with the new canonical redirect. Fixes #3652

File:

• trunk/bp-core/bp-core-buddybar.php (modified) (3 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -44 +44 @@
         'show_for_displayed_user' => $show_for_displayed_user,
         'position'                => $position,
-        'screen_function'         => &$screen_function
+        'screen_function'         => &$screen_function,
+        'default_subnav_slug'     => $default_subnav_slug
     );
 
@@ -118 +119 @@
     $bp->bp_nav[$parent_slug]['screen_function'] = &$screen_function;
 
+    // If the current_action has been set to the default_subnav_slug, it will be reflected
+    // in the redirect_stack. Unset the action manually so that the new nav default can be set
+    if ( !empty( $bp->redirect_stack['action'] ) && $bp->redirect_stack['action'] == $bp->bp_nav[$parent_slug]['default_subnav_slug'] ) {
+        $bp->current_action = '';
+    }
+
     if ( $bp->current_component == $parent_slug && !$bp->current_action ) {
         if ( !is_object( $screen_function[0] ) )
@@ -124 +131 @@
             add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
 
-        if ( $subnav_slug )
-            $bp->current_action = $subnav_slug;
+        if ( $subnav_slug ) {
+            $bp->current_action           = $subnav_slug;
+            $bp->redirect_stack['action'] = $bp->current_action;
+        }
     }
 }