<!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][8932] trunk/src/bp-core/bp-core-catchuri.php: Fixes a regression in r8821 in `rbp_core_load_template()` which was preventing the correct parent page being highlighted in WP nav menus.</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/8932">8932</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-08-17 10:12:10 +0000 (Sun, 17 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes a regression in <a href="http://buddypress.trac.wordpress.org/changeset/8821">r8821</a> in `rbp_core_load_template()` which was preventing the correct parent page being highlighted in WP nav menus.
This change reinstates the page look up and post globals as before <a href="http://buddypress.trac.wordpress.org/changeset/8821">r8821</a>. Overall, these changes are still a net benefit as an uncached SQL query has been removed. See <a href="http://buddypress.trac.wordpress.org/ticket/5241">#5241</a> for background.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5810">#5810</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 (8931 => 8932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-catchuri.php 2014-08-17 09:56:37 UTC (rev 8931)
+++ trunk/src/bp-core/bp-core-catchuri.php 2014-08-17 10:12:10 UTC (rev 8932)
</span><span class="lines">@@ -342,21 +342,39 @@
</span><span class="cx"> function bp_core_load_template( $templates ) {
</span><span class="cx"> global $wp_query;
</span><span class="cx">
</span><del>- // 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',
- ) );
</del><ins>+ // check if BP page belongs to, or is a child of, a BP directory page
+ $page_id = false;
+ foreach ( (array) buddypress()->pages as $page ) {
+ if ( $page->name == buddypress()->unfiltered_uri[buddypress()->unfiltered_uri_offset] ) {
+ $page_id = $page->id;
+ break;
+ }
+ }
</ins><span class="cx">
</span><del>- // need to set theme compat to false since the reset post function
- // automatically sets theme compat to true
- bp_set_theme_compat_active( false );
</del><ins>+ // Set up reset post args
+ $reset_post_args = array(
+ 'is_404' => true,
+ 'post_status' => 'publish',
+ );
+
+ // BP page exists - fill in the $wp_query->post object
+ //
+ // bp_theme_compat_reset_post() looks at the $wp_query->post object to fill in
+ // the post globals
+ if ( ! empty( $page_id ) ) {
+ $wp_query->post = get_post( $page_id );
+ $reset_post_args['ID'] = $page_id;
+ } else {
+ $reset_post_args['ID'] = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Reset the post
+ bp_theme_compat_reset_post( $reset_post_args );
+
+ // 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"> // 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>