Changeset 4057 for trunk/bp-groups/bp-groups-loader.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-groups/bp-groups-loader.php (modified) (7 diffs)

trunk/bp-groups/bp-groups-loader.php

@@ -232 +232 @@
                 if ( bp_is_groups_component() && bp_is_single_item() ) {
 
+                        unset( $main_nav ); unset( $sub_nav );
+
                         // Add 'Groups' to the main navigation
                         $main_nav = array(
                                 'name'                => __( 'Groups', 'buddypress' ),
-                                'slug'                => $this->root_slug,
+                                'slug'                => $this->current_group->slug,
                                 'position'            => -1, // Do not show in BuddyBar
                                 'screen_function'     => 'groups_screen_group_home',
@@ -249 +251 @@
                                 'slug'            => 'home',
                                 'parent_url'      => $group_link,
-                                'parent_slug'     => $this->root_slug,
+                                'parent_slug'     => $this->current_group->slug,
                                 'screen_function' => 'groups_screen_group_home',
                                 'position'        => 10,
@@ -261 +263 @@
                                         'slug'            => 'admin',
                                         'parent_url'      => $group_link,
-                                        'parent_slug'     => $this->root_slug,
+                                        'parent_slug'     => $this->current_group->slug,
                                         'screen_function' => 'groups_screen_group_admin',
                                         'position'        => 20,
@@ -280 +282 @@
                                         'slug'               => 'request-membership',
                                         'parent_url'         => $group_link,
-                                        'parent_slug'        => $this->root_slug,
+                                        'parent_slug'        => $this->current_group->slug,
                                         'screen_function'    => 'groups_screen_group_request_membership',
                                         'position'           => 30
@@ -292 +294 @@
                                         'slug'            => 'forum',
                                         'parent_url'      => $group_link,
-                                        'parent_slug'     => $this->root_slug,
+                                        'parent_slug'     => $this->current_group->slug,
                                         'screen_function' => 'groups_screen_group_forum',
                                         'position'        => 40,
@@ -304 +306 @@
                                 'slug'            => 'members',
                                 'parent_url'      => $group_link,
-                                'parent_slug'     => $this->root_slug,
+                                'parent_slug'     => $this->current_group->slug,
                                 'screen_function' => 'groups_screen_group_members',
                                 'position'        => 60,
@@ -317 +319 @@
                                                 'slug'            => 'send-invites',
                                                 'parent_url'      => $group_link,
-                                                'parent_slug'     => $this->root_slug,
+                                                'parent_slug'     => $this->current_group->slug,
                                                 'screen_function' => 'groups_screen_group_invite',
                                                 'item_css_id'     => 'invite',