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

Timestamp:

02/21/2011 01:03:41 PM (15 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-template.php (modified) (1 diff)

trunk/bp-core/bp-core-template.php

@@ -22 +22 @@
     $component_index = !empty( $bp->displayed_user ) ? $bp->current_component : bp_get_root_slug( $bp->current_component );
 
-    if ( !isset( $bp->bp_options_nav[$component_index] ) || count( $bp->bp_options_nav[$component_index] ) < 1 )
-        return false;
+    if ( !bp_is_single_item() ) {
+        if ( !isset( $bp->bp_options_nav[$component_index] ) || count( $bp->bp_options_nav[$component_index] ) < 1 ) {
+            return false;
+        } else {
+            $the_index = $component_index;
+        }
+    } else {
+        if ( !isset( $bp->bp_options_nav[$bp->current_item] ) || count( $bp->bp_options_nav[$bp->current_item] ) < 1 ) {
+            return false;
+        } else {
+            $the_index = $bp->current_item;
+        }
+    }
 
     // Loop through each navigation item
-    foreach ( (array)$bp->bp_options_nav[$component_index] as $subnav_item ) {
+    foreach ( (array)$bp->bp_options_nav[$the_index] as $subnav_item ) {
         if ( !$subnav_item['user_has_access'] )
             continue;