<!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][8821] trunk/src/bp-core/bp-core-catchuri.php: In `bp_core_load_template()`, reset post globals if we're on a non-directory page.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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><a href="http://buddypress.trac.wordpress.org/changeset/8821">8821</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2014-08-13 03:20:55 +0000 (Wed, 13 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `bp_core_load_template()`, reset post globals if we're on a non-directory page.
If we're on a non-directory page, we are faking a WordPress page, so we
must reset the WordPress post globals to avoid notices from appearing. The
reset is done with the `bp_theme_compat_reset_post()` function and notably
fixes notices when the root profiles feature is toggled.
Commit also removes an unnecessary database query to determine whether
we're on a BuddyPress directory page. WordPress should have already made
this determination before BuddyPress has reached this point in
`bp_core_load_template()`.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5241">#5241</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorecatchuriphp">trunk/src/bp-core/bp-core-catchuri.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-catchuri.php (8820 => 8821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-catchuri.php 2014-08-13 02:00:53 UTC (rev 8820)
+++ trunk/src/bp-core/bp-core-catchuri.php 2014-08-13 03:20:55 UTC (rev 8821)
</span><span class="lines">@@ -340,32 +340,23 @@
</span><span class="cx"> * @return bool|null Returns false on failure.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_load_template( $templates ) {
</span><del>- global $post, $bp, $wp_query, $wpdb;
</del><ins>+ global $wp_query;
</ins><span class="cx">
</span><del>- // Determine if the root object WP page exists for this request
- // note: get_page_by_path() breaks non-root pages
- if ( !empty( $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>+ // reset post if not on a directory page
+ // if we're not on a directory page, this means we're faking a page and we
+ // need to reset the post to avoid notices
+ if ( ! bp_is_directory() ) {
+ bp_theme_compat_reset_post( array(
+ 'ID' => 0,
+ 'is_404' => true,
+ 'post_status' => 'publish',
+ ) );
</ins><span class="cx">
</span><del>- // Set the root object as the current wp_query-ied item
- $object_id = 0;
- foreach ( (array) $bp->pages as $page ) {
- if ( $page->name == $bp->unfiltered_uri[$bp->unfiltered_uri_offset] ) {
- $object_id = $page->id;
- }
</del><ins>+ // need to set theme compat to false since the reset post function
+ // automatically sets theme compat to true
+ bp_set_theme_compat_active( false );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // 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;
- $wp_query->post = $wp_query->queried_object;
- $post = $wp_query->queried_object;
- }
-
</del><span class="cx"> // Fetch each template and add the php suffix
</span><span class="cx"> $filtered_templates = array();
</span><span class="cx"> foreach ( (array) $templates as $template ) {
</span></span></pre>
</div>
</div>
</body>
</html>