Changeset 4600 for trunk/bp-core/bp-core-buddybar.php

Timestamp:

07/04/2011 03:25:38 PM (13 years ago)

Author:

boonebgorges

Message:

Ensures that changes to bp_core_new_subnav_item() introduced in r4599 do not apply to broadly to the groups component.

File:

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

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

@@ -215 +215 @@
      *       and this subnav item is the default for the parent item (which we check by
      *       comparing this subnav item's screen function with the screen function of the
-     *       parent nav item in $bp->bp_nav).
+     *       parent nav item in $bp->bp_nav). This condition only arises when viewing a
+     *       user, since groups should always have an action set.
      */
     
@@ -223 +224 @@
         
     // If we *do* meet condition (2), then the added subnav item is currently being requested
-    if ( ( !empty( $bp->current_action ) && $slug == $bp->current_action ) || ( empty( $bp->current_action ) && $screen_function == $bp->bp_nav[$parent_slug]['screen_function'] ) ) {
+    if ( ( !empty( $bp->current_action ) && $slug == $bp->current_action ) || ( bp_is_user() && empty( $bp->current_action ) && $screen_function == $bp->bp_nav[$parent_slug]['screen_function'] ) ) {
+    
         // Before hooking the screen function, check user access
         if ( $user_has_access ) {