<!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" />
<title>[BuddyPress][3910] trunk: Fix bug where group topic template was not loading.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3910</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 14:22:26 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix bug where group topic template was not loading. Use new action/component api.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsscreensphp">trunk/bp-groups/bp-groups-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (3909 => 3910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-01-24 13:46:58 UTC (rev 3909)
+++ trunk/bp-forums/bp-forums-template.php 2011-01-24 14:22:26 UTC (rev 3910)
</span><span class="lines">@@ -885,14 +885,14 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- if ( !$topic_id && $bp->current_component == $bp->groups->slug && 'forum' == $bp->current_action && 'topic' == $bp->action_variables[0] )
</del><ins>+ if ( empty( $topic_id ) && bp_is_current_component( 'groups') && bp_is_current_action( 'forum' ) && 'topic' == $bp->action_variables[0] )
</ins><span class="cx"> $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
</span><span class="cx">
</span><span class="cx"> if ( is_numeric( $topic_id ) ) {
</span><span class="cx"> $topic_template = new BP_Forums_Template_Topic( $topic_id, $per_page, $max, $order );
</span><span class="cx">
</span><span class="cx"> // Current topic forum_id needs to match current_group forum_id
</span><del>- if ( $bp->current_component == $bp->groups->slug && $topic_template->forum_id != groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) )
</del><ins>+ if ( bp_is_current_component( 'groups' ) && $topic_template->forum_id != groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (3909 => 3910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-01-24 13:46:58 UTC (rev 3909)
+++ trunk/bp-groups/bp-groups-screens.php 2011-01-24 14:22:26 UTC (rev 3910)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> if ( !is_super_admin() && groups_is_user_banned( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
</span><span class="cx"> $user_is_banned = true;
</span><span class="cx">
</span><del>- if ( $topic_slug && $topic_id ) {
</del><ins>+ if ( !empty( $topic_slug ) && !empty( $topic_id ) ) {
</ins><span class="cx">
</span><span class="cx"> // Posting a reply
</span><span class="cx"> if ( !$user_is_banned && !isset( $bp->action_variables[2] ) && isset( $_POST['submit_reply'] ) ) {
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Delete a topic
</span><del>- else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
</del><ins>+ else if ( empty( $user_is_banned ) && isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
</ins><span class="cx"> // Fetch the topic
</span><span class="cx"> $topic = bp_forums_get_topic_details( $topic_id );
</span><span class="cx">
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Editing a topic
</span><del>- else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
</del><ins>+ else if ( empty( $user_is_banned ) && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
</ins><span class="cx"> // Fetch the topic
</span><span class="cx"> $topic = bp_forums_get_topic_details( $topic_id );
</span><span class="cx">
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Delete a post
</span><del>- else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
</del><ins>+ elseif ( empty( $user_is_banned ) && isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
</ins><span class="cx"> // Fetch the post
</span><span class="cx"> $post = bp_forums_get_post( $post_id );
</span><span class="cx">
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Editing a post
</span><del>- else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
</del><ins>+ elseif ( empty( $user_is_banned ) && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
</ins><span class="cx"> // Fetch the post
</span><span class="cx"> $post = bp_forums_get_post( $bp->action_variables[4] );
</span><span class="cx">
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx">
</span><span class="cx"> // Standard topic display
</span><span class="cx"> else {
</span><del>- if ( $user_is_banned )
</del><ins>+ if ( !empty( $user_is_banned ) )
</ins><span class="cx"> bp_core_add_message( __( "You have been banned from this group.", 'buddypress' ) );
</span><span class="cx">
</span><span class="cx"> bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/single/home' ) );
</span></span></pre>
</div>
</div>
</body>
</html>