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

Timestamp:

11/26/2011 03:44:02 AM (14 years ago)

Author:

boonebgorges

Message:

404 when attempting to access the URL of a hidden group. Fixes #3462

File:

• trunk/bp-groups/bp-groups-loader.php (modified) (1 diff)

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

@@ -167 +167 @@
         if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
 
-            if ( !empty( $bp->current_action ) && !$this->current_group->user_has_access ) {
-                if ( is_user_logged_in() ) {
-                    // Off-limits to this user. Throw an error and redirect to the group's home page
-                    bp_core_no_access( array(
-                        'message'  => __( 'You do not have access to this group.', 'buddypress' ),
-                        'root'     => bp_get_group_permalink( $bp->groups->current_group ),
-                        'redirect' => false
-                    ) );
+            if ( !$this->current_group->user_has_access ) {
+                if ( 'hidden' == $this->current_group->status ) {
+                    // Hidden groups should return a 404 for non-members.
+                    // Unset the current group so that you're not redirected
+                    // to the default group tab
+                    $this->current_group = 0;
+                    $bp->is_single_item  = false;
+                    bp_do_404();
+                    return;
                 } else {
-                    // Allow the user to log in
-                    bp_core_no_access();
+                    if ( is_user_logged_in() ) {
+                        // Off-limits to this user. Throw an error and redirect to the group's home page
+                        bp_core_no_access( array(
+                            'message'  => __( 'You do not have access to this group.', 'buddypress' ),
+                            'root'     => bp_get_group_permalink( $bp->groups->current_group ),
+                            'redirect' => false
+                        ) );
+                    } else {
+                        // Allow the user to log in
+                        bp_core_no_access();
+                    }
                 }
 
             // User has access. Default to a particular group extension if not specified on the URL
-            } elseif ( empty( $bp->current_action ) && $this->current_group->user_has_access ) {
+            } elseif ( !bp_current_action() ) {
                 $bp->current_action = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION :  'home' );
             }