Changeset 2953

Timestamp:

04/26/2010 11:22:07 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2343 props boonebgorges and 3sixty

File:

• branches/1.2/bp-forums/bp-forums-templatetags.php (modified) (5 diffs)

branches/1.2/bp-forums/bp-forums-templatetags.php

@@ -7 +7 @@
     var $topic;
 
+    var $forum_id;
+
     var $in_the_loop;
 
@@ -26 +28 @@
         $this->type = $type;
         $this->search_terms = $search_terms;
+        $this->forum_id = $forum_id;
 
         switch ( $type ) {
@@ -694 +697 @@
     var $post;
 
+    var $forum_id;
     var $topic_id;
     var $topic;
@@ -717 +721 @@
         $this->topic_id = $topic_id;
         $forum_template->topic = (object) bp_forums_get_topic_details( $this->topic_id );
+        $this->forum_id = $forum_template->topic->forum_id;
 
         $this->posts = bp_forums_get_topic_posts( array( 'topic_id' => $this->topic_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num ) );
@@ -812 +817 @@
         $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
 
-    if ( is_numeric( $topic_id ) )
+    if ( is_numeric( $topic_id ) ) {
         $topic_template = new BP_Forums_Template_Topic( $topic_id, $per_page, $max );
-    else
+
+        // Current topic forum_id needs to match current_group forum_id
+        if ( $bp->current_component == $bp->groups->slug && $topic_template->forum_id != groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) )
+            return false;
+
+    } else {
         return false;
+    }
 
     return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), &$topic_template );