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

Timestamp:

02/21/2011 01:03:41 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Switch individual group navigation to use current_item as slug instead of root_component, to avoid collisions in bp_options_nav resulting in single groups not being visible if the group->slug is the same as the group->root_slug. Adjust the bp_core_new_nav_item() and bp_core_new_subnav_item() functions to look for new current_item option. Should be backwards compatible with existing group extensions, but will need testing.

File:

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

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

@@ -54 +54 @@
 
     /***
-     * If we are not viewing a user, and this is a root component, don't attach the
-     * default subnav function so we can display a directory or something else.
+     * If the nav item is visible, we are not viewing a user, and this is a root
+     * component, don't attach the default subnav function so we can display a
+     * directory or something else.
      */
-    if ( bp_is_root_component( $slug ) && !bp_displayed_user_id() )
+    if ( ( -1 != $position ) && bp_is_root_component( $slug ) && !bp_displayed_user_id() )
         return;
 
+    // Look for current component
     if ( bp_is_current_component( $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] ), 3 );
+
+        if ( !empty( $default_subnav_slug ) )
+            $bp->current_action = $default_subnav_slug;
+
+    // Look for current item
+    } elseif ( bp_is_current_item( $slug ) && !bp_current_action() ) {
         if ( !is_object( $screen_function[0] ) )
             add_action( 'bp_screens', $screen_function );
@@ -186 +198 @@
     );
 
+    // Look for current component
     if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
+        if ( !is_object( $screen_function[0] ) )
+            add_action( 'bp_screens', $screen_function );
+        else
+            add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
+
+    // Look for current item
+    } elseif ( ( $bp->current_action == $slug && $bp->current_item == $parent_slug ) && $user_has_access ) {
         if ( !is_object( $screen_function[0] ) )
             add_action( 'bp_screens', $screen_function );