<!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][4124] trunk: Correctly handle invalid forum permalinks.</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>4124</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-03-12 00:32:15 +0000 (Sat, 12 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correctly handle invalid forum permalinks. Also fixes a couple of PHP notices. Fixes #2349.</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 (4123 => 4124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-03-12 00:30:26 UTC (rev 4123)
+++ trunk/bp-forums/bp-forums-template.php 2011-03-12 00:32:15 UTC (rev 4124)
</span><span class="lines">@@ -898,20 +898,20 @@
</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 ( empty( $topic_id ) && bp_is_current_component( 'groups') && bp_is_current_action( 'forum' ) && 'topic' == $bp->action_variables[0] )
</del><ins>+ 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] ) )
</ins><span class="cx"> $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
</span><span class="cx"> elseif ( empty( $topic_id ) && bp_is_current_component( 'forums') && bp_is_current_action( 'topic' ) && !empty( $bp->action_variables[0] ) )
</span><span class="cx"> $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[0] );
</span><span class="cx">
</span><del>- if ( is_numeric( $topic_id ) ) {
- $topic_template = new BP_Forums_Template_Topic( $topic_id, $per_page, $max, $order );
</del><ins>+ if ( empty( $topic_id ) ) {
+ return false;
</ins><span class="cx">
</span><ins>+ } else {
+ $topic_template = new BP_Forums_Template_Topic( (int) $topic_id, $per_page, $max, $order );
+
</ins><span class="cx"> // Current topic forum_id needs to match current_group forum_id
</span><span class="cx"> if ( bp_is_current_component( 'groups' ) && $topic_template->forum_id != groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) )
</span><span class="cx"> return false;
</span><del>-
- } else {
- return false;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), $topic_template );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (4123 => 4124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-03-12 00:30:26 UTC (rev 4123)
+++ trunk/bp-groups/bp-groups-screens.php 2011-03-12 00:32:15 UTC (rev 4124)
</span><span class="lines">@@ -103,12 +103,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_screen_group_forum() {
</span><del>- global $bp;
</del><ins>+ global $bp, $wp_query;
</ins><span class="cx">
</span><span class="cx"> if ( bp_is_single_item() && $bp->groups->current_group->user_has_access ) {
</span><span class="cx">
</span><span class="cx"> // Fetch the details we need
</span><del>- $topic_slug = isset( $bp->action_variables[1] ) ? $bp->action_variables[1] : false;
</del><ins>+ $topic_slug = !empty( $bp->action_variables[1] ) ? $bp->action_variables[1] : false;
</ins><span class="cx"> $topic_id = bp_forums_get_topic_id_from_slug( $topic_slug );
</span><span class="cx"> $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
</span><span class="cx"> $user_is_banned = false;
</span><span class="lines">@@ -302,6 +302,13 @@
</span><span class="cx"> bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/single/home' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Forum topic does not exist
+ } elseif ( !empty( $topic_slug ) && empty( $topic_id ) ) {
+ $wp_query->set_404();
+ status_header( 404 );
+ nocache_headers();
+ return;
+
</ins><span class="cx"> } else {
</span><span class="cx"> // Posting a topic
</span><span class="cx"> if ( isset( $_POST['submit_topic'] ) && function_exists( 'bp_forums_new_topic') ) {
</span></span></pre>
</div>
</div>
</body>
</html>