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

Timestamp:

03/12/2011 12:32:15 AM (15 years ago)

Author:

djpaul

Message:

Correctly handle invalid forum permalinks. Also fixes a couple of PHP notices. Fixes #2349.

File:

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

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

@@ -104 +104 @@
 
 function groups_screen_group_forum() {
-    global $bp;
+    global $bp, $wp_query;
 
     if ( bp_is_single_item() && $bp->groups->current_group->user_has_access ) {
 
         // Fetch the details we need
-        $topic_slug     = isset( $bp->action_variables[1] ) ? $bp->action_variables[1] : false;
+        $topic_slug     = !empty( $bp->action_variables[1] ) ? $bp->action_variables[1] : false;
         $topic_id       = bp_forums_get_topic_id_from_slug( $topic_slug );
         $forum_id       = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
@@ -302 +302 @@
                 bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/single/home' ) );
             }
+
+        // Forum topic does not exist
+        } elseif ( !empty( $topic_slug ) && empty( $topic_id ) ) {
+            $wp_query->set_404();
+            status_header( 404 );
+            nocache_headers();
+            return;
 
         } else {