Changeset 4506 for trunk/bp-groups/bp-groups-screens.php

Timestamp:

06/13/2011 09:54:52 PM (15 years ago)

Author:

boonebgorges

Message:

Introduces bp_do_404() for easy 404ing. Corrects invalid path handling throughout, using bp_do_404(). Fixes #3280. Props DJPaul

File:

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

trunk/bp-groups/bp-groups-screens.php

@@ -104 +104 @@
 
 function groups_screen_group_forum() {
-        global $bp, $wp_query;
+        global $bp;
 
         if ( !bp_is_active( 'forums' ) || !bp_forums_is_installed_correctly() )
                 return false;
 
-        if ( bp_is_single_item() && $bp->groups->current_group->user_has_access ) {
+        if ( !empty( $bp->action_variables[0] ) && 'topic' != $bp->action_variables[0] ) {
+                bp_do_404();
+                return;
+        }
+
+        if ( !$bp->groups->current_group->user_has_access ) {
+                bp_core_no_access();
+                return;
+        }
+
+        if ( bp_is_single_item() ) {
 
                 // Fetch the details we need
@@ -311 +321 @@
                 // Forum topic does not exist
                 } elseif ( !empty( $topic_slug ) && empty( $topic_id ) ) {
-                        $wp_query->set_404();
-                        status_header( 404 );
-                        nocache_headers();
+                        bp_do_404();
                         return;
 
@@ -390 +398 @@
                         // Send the invites.
                         groups_send_invites( $bp->loggedin_user->id, $bp->groups->current_group->id );
-
                         bp_core_add_message( __('Group invites sent.', 'buddypress') );
-
                         do_action( 'groups_screen_group_invite', $bp->groups->current_group->id );
-
                         bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
-                } else {
+
+                } elseif ( empty( $bp->action_variables[0] ) ) {
                         // Show send invite page
                         bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/single/home' ) );
+
+                } else {
+                        bp_do_404();
                 }
         }