Changeset 5971

Timestamp:

04/09/2012 09:45:56 PM (14 years ago)

Author:

boonebgorges

Message:

Reconfigure the way that the default group extension gets communicated to BP_Groups_Component::setup_nav().
By ensuring that the top-level single-group navigation item has its default_subnav_slug set dynamically to the correct default_extension, we ensure that the Home (Activity) tab remains accessible even when it is not the default.
Fixes #4072

File:

• trunk/bp-groups/bp-groups-loader.php (modified) (3 diffs)

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

@@ -16 +16 @@
 
 class BP_Groups_Component extends BP_Component {
+    /**
+     * Default group extension
+     *
+     * @since BuddyPress (1.6)
+     */
+    var $default_component;
 
     /**
@@ -177 +183 @@
             }
             
-            $groups_default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
-            
+            $this->default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
+
             if ( !bp_current_action() ) {
-                $bp->current_action = $groups_default_extension;
-            } else if ( bp_is_current_action( $groups_default_extension ) && !empty( $bp->action_variables ) )  {
+                $bp->current_action = $this->default_extension;
+            } else if ( bp_is_current_action( $this->default_extension ) && !empty( $bp->action_variables ) )  {
                 unset( $bp->canonical_stack['action'] );
             }
@@ -323 +329 @@
                 'position'            => -1, // Do not show in BuddyBar
                 'screen_function'     => 'groups_screen_group_home',
-                'default_subnav_slug' => 'home',
+                'default_subnav_slug' => $this->default_extension,
                 'item_css_id'         => $this->id
             );