<!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] [2865] trunk/bp-core/bp-core-catchuri.php:
Make sure that we have a valid $post object on all BP pages.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2865</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-03-22 12:28:41 +0000 (Mon, 22 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure that we have a valid $post object on all BP pages.</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 (2864 => 2865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2010-03-22 11:54:23 UTC (rev 2864)
+++ trunk/bp-core/bp-core-catchuri.php 2010-03-22 12:28:41 UTC (rev 2865)
</span><span class="lines">@@ -146,9 +146,8 @@
</span><span class="cx"> $uri_offset = $uri_offset + 2;
</span><span class="cx">
</span><span class="cx"> /* Remove everything from the URI up to the offset and take it from there. */
</span><del>- for ( $i = 0; $i < $uri_offset; $i++ ) {
</del><ins>+ for ( $i = 0; $i < $uri_offset; $i++ )
</ins><span class="cx"> unset( $bp_uri[$i] );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $current_component = $bp_uri[$uri_offset];
</span><span class="cx"> }
</span><span class="lines">@@ -208,9 +207,9 @@
</span><span class="cx"> * @return int the user ID of the matched user.
</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><del>- /* Determine if the root object WP page exists for this request (is there an API function for this?)*/
</del><ins>+ /* Determine if the root object WP page exists for this request (TODO: is there an API function for this?) */
</ins><span class="cx"> if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -220,9 +219,14 @@
</span><span class="cx"> $object_id = $page->id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $wp_query->queried_object = &get_post( $object_id );
- $wp_query->queried_object_id = $object_id;
</del><ins>+ /* 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;
</ins><span class="cx">
</span><ins>+ $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></pre>
</div>
</div>
</body>
</html>