<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2953] branches/1.2/bp-forums/bp-forums-templatetags.php:
Fixes #2343 props boonebgorges and 3sixty</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2953</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-04-26 23:22:07 +0000 (Mon, 26 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2343 props boonebgorges and 3sixty</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpforumsbpforumstemplatetagsphp">branches/1.2/bp-forums/bp-forums-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-forums/bp-forums-templatetags.php (2952 => 2953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-forums/bp-forums-templatetags.php 2010-04-25 13:13:15 UTC (rev 2952)
+++ branches/1.2/bp-forums/bp-forums-templatetags.php 2010-04-26 23:22:07 UTC (rev 2953)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx"> var $topics;
</span><span class="cx"> var $topic;
</span><span class="cx">
</span><ins>+ var $forum_id;
+
</ins><span class="cx"> var $in_the_loop;
</span><span class="cx">
</span><span class="cx"> var $pag_page;
</span><span class="lines">@@ -25,6 +27,7 @@
</span><span class="cx"> $this->pag_num = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : $per_page;
</span><span class="cx"> $this->type = $type;
</span><span class="cx"> $this->search_terms = $search_terms;
</span><ins>+ $this->forum_id = $forum_id;
</ins><span class="cx">
</span><span class="cx"> switch ( $type ) {
</span><span class="cx"> case 'newest': default:
</span><span class="lines">@@ -693,6 +696,7 @@
</span><span class="cx"> var $posts;
</span><span class="cx"> var $post;
</span><span class="cx">
</span><ins>+ var $forum_id;
</ins><span class="cx"> var $topic_id;
</span><span class="cx"> var $topic;
</span><span class="cx">
</span><span class="lines">@@ -716,6 +720,7 @@
</span><span class="cx">
</span><span class="cx"> $this->topic_id = $topic_id;
</span><span class="cx"> $forum_template->topic = (object) bp_forums_get_topic_details( $this->topic_id );
</span><ins>+ $this->forum_id = $forum_template->topic->forum_id;
</ins><span class="cx">
</span><span class="cx"> $this->posts = bp_forums_get_topic_posts( array( 'topic_id' => $this->topic_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num ) );
</span><span class="cx">
</span><span class="lines">@@ -811,10 +816,16 @@
</span><span class="cx"> if ( !$topic_id && $bp->current_component == $bp->groups->slug && 'forum' == $bp->current_action && 'topic' == $bp->action_variables[0] )
</span><span class="cx"> $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
</span><span class="cx">
</span><del>- if ( is_numeric( $topic_id ) )
</del><ins>+ if ( is_numeric( $topic_id ) ) {
</ins><span class="cx"> $topic_template = new BP_Forums_Template_Topic( $topic_id, $per_page, $max );
</span><del>- else
</del><ins>+
+ // 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 {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), &$topic_template );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>