Changeset 5392 for trunk/bp-groups/bp-groups-loader.php

Timestamp:

11/27/2011 05:01:30 PM (15 years ago)

Author:

boonebgorges

Message:

Corrects logic for protecting hidden vs private group access in bp-groups-loader.php

File:

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

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

@@ -163 +163 @@
                         return;
                 }
+                
+                if ( !bp_current_action() ) {
+                        $bp->current_action = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
+                }
 
                 // Group access control
                 if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
-
                         if ( !$this->current_group->user_has_access ) {
                                 if ( 'hidden' == $this->current_group->status ) {
@@ -176 +179 @@
                                         bp_do_404();
                                         return;
-                                } else {
+                                } elseif ( !bp_is_current_action( 'home' ) ) {
                                         if ( is_user_logged_in() ) {
                                                 // Off-limits to this user. Throw an error and redirect to the group's home page
@@ -189 +192 @@
                                         }
                                 }
-
-                        // User has access. Default to a particular group extension if not specified on the URL
-                        } elseif ( !bp_current_action() ) {
-                                $bp->current_action = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION :  'home' );
                         }
                 }