<!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][3583] trunk/bp-core/bp-core-catchuri.php: Don't send 404 headers on good pages; reverts parts of r3488.</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>3583</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-25 18:01:57 +0000 (Sat, 25 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't send 404 headers on good pages; reverts parts of r3488. Fixes #2969</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (3582 => 3583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2010-12-24 20:30:23 UTC (rev 3582)
+++ trunk/bp-core/bp-core-catchuri.php 2010-12-25 18:01:57 UTC (rev 3583)
</span><span class="lines">@@ -105,7 +105,6 @@
</span><span class="cx">
</span><span class="cx"> // Reset the keys by merging with an empty array
</span><span class="cx"> $bp_uri = array_merge( array(), $bp_uri );
</span><del>- $bp_unfiltered_uri = $bp_uri;
</del><span class="cx">
</span><span class="cx"> // If a component is set to the front page, force its name into $bp_uri so that $current_component is populated
</span><span class="cx"> if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && empty( $bp_uri ) ) {
</span><span class="lines">@@ -114,6 +113,8 @@
</span><span class="cx"> $bp_uri[0] = $post->post_name;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $bp_unfiltered_uri = $bp_uri;
+
</ins><span class="cx"> // Find a match within registered BuddyPress controlled WP pages (check members first)
</span><span class="cx"> foreach ( (array)$bp_pages as $page_key => $bp_page ) {
</span><span class="cx"> if ( in_array( $bp_page->name, (array)$bp_uri ) ) {
</span><span class="lines">@@ -228,20 +229,40 @@
</span><span class="cx"> * @return false|int The user ID of the matched user, or false.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_load_template( $templates ) {
</span><del>- global $bp, $wpdb, $wp_query, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
</del><ins>+ global $post, $bp, $wpdb, $wp_query, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
</ins><span class="cx">
</span><span class="cx"> // Determine if the root object WP page exists for this request (TODO: is there an API function for this?
</span><del>- if ( !empty( $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) )
- if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
- return false;
</del><ins>+ if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
+ return false;
</ins><span class="cx">
</span><ins>+ // Set the root object as the current wp_query-ied item
+ $object_id = 0;
+ foreach ( (array)$bp->pages as $page ) {
+ if ( isset( $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) && $page->name == $bp_unfiltered_uri[$bp_unfiltered_uri_offset] )
+ $object_id = $page->id;
+ }
+
+ // Make the queried/post object an actual valid page
+ if ( !empty( $object_id ) ) {
+ $wp_query->queried_object = &get_post( $object_id );
+ $wp_query->queried_object_id = $object_id;
+
+ $post = $wp_query->queried_object;
+ }
+
</ins><span class="cx"> // Fetch each template and add the php suffix
</span><span class="cx"> foreach ( (array)$templates as $template )
</span><span class="cx"> $filtered_templates[] = $template . '.php';
</span><span class="cx">
</span><span class="cx"> // Filter the template locations so that plugins can alter where they are located
</span><del>- if ( $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates ) )
</del><ins>+ if ( $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates ) ) {
+ // Template was located, lets set this as a valid page and not a 404.
+ status_header( 200 );
+ $wp_query->is_page = true;
+ $wp_query->is_404 = false;
+
</ins><span class="cx"> load_template( apply_filters( 'bp_load_template', $located_template ) );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Kill any other output after this.
</span><span class="cx"> die;
</span></span></pre>
</div>
</div>
</body>
</html>