Changeset 4124 for trunk/bp-forums/bp-forums-template.php

Timestamp:

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

Author:

djpaul

Message:

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

File:

• trunk/bp-forums/bp-forums-template.php (modified) (1 diff)

trunk/bp-forums/bp-forums-template.php

@@ -899 +899 @@
     extract( $r, EXTR_SKIP );
 
-    if ( empty( $topic_id ) && bp_is_current_component( 'groups') && bp_is_current_action( 'forum' ) && 'topic' == $bp->action_variables[0] )
+    if ( empty( $topic_id ) && bp_is_current_component( 'groups') && bp_is_current_action( 'forum' ) && !empty( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] && !empty( $bp->action_variables[1] ) )
         $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
     elseif ( empty( $topic_id ) && bp_is_current_component( 'forums') && bp_is_current_action( 'topic' ) && !empty( $bp->action_variables[0] ) )
         $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[0] );
 
-    if ( is_numeric( $topic_id ) ) {
-        $topic_template = new BP_Forums_Template_Topic( $topic_id, $per_page, $max, $order );
+    if ( empty( $topic_id ) ) {
+        return false;
+
+    } else {
+        $topic_template = new BP_Forums_Template_Topic( (int) $topic_id, $per_page, $max, $order );
 
         // Current topic forum_id needs to match current_group forum_id
         if ( bp_is_current_component( 'groups' ) && $topic_template->forum_id != groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) )
             return false;
-
-    } else {
-        return false;
     }