<!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][10212] trunk: URI: Allow root profiles to work when the 'Members' page is nested.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10212">10212</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10212","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-08 04:52:31 +0000 (Thu, 08 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>URI: Allow root profiles to work when the 'Members' page is nested.
Previously, if the Members page was nested as a child of another page, the
root profiles feature - `define( 'BP_ENABLE_ROOT_PROFILES', true );` - did
not work. This commit fixes this and includes a unit test.
Commit also adds a minor performance tweak when a root profile is detected.
Props r-a-y, boonebgorges.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6477">#6477</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorecatchuriphp">trunk/src/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunktestsphpunittestcasesroutingrootprofilesphp">trunk/tests/phpunit/testcases/routing/root-profiles.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-catchuri.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-catchuri.php 2015-10-08 04:47:38 UTC (rev 10211)
+++ trunk/src/bp-core/bp-core-catchuri.php 2015-10-08 04:52:31 UTC (rev 10212)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,8 +240,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Rejig the offset
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $slug ) && ( 1 < count( $slug ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_pop( $slug );
- $uri_offset = count( $slug );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only offset if not on a root profile. Fixes issue when Members page is nested.
+ if ( false === $root_profile ) {
+ array_pop( $slug );
+ $uri_offset = count( $slug );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Global the unfiltered offset to use in bp_core_load_template().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,9 +267,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Are we viewing a specific user?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $after_member_slug ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If root profile, we've already queried for the user
+ if ( $root_profile instanceof WP_User ) {
+ $bp->displayed_user->id = $root_profile->ID;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Switch the displayed_user based on compatibility mode
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_is_username_compatibility_mode() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( bp_is_username_compatibility_mode() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $bp->displayed_user->id = (int) bp_core_get_userid( urldecode( $after_member_slug ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->displayed_user->id = (int) bp_core_get_userid_from_nicename( $after_member_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestcasesroutingrootprofilesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/routing/root-profiles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/routing/root-profiles.php 2015-10-08 04:47:38 UTC (rev 10211)
+++ trunk/tests/phpunit/testcases/routing/root-profiles.php 2015-10-08 04:52:31 UTC (rev 10212)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,6 +42,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $this->u->ID, bp_displayed_user_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket BP6475
+ */
+ public function test_member_permalink_when_members_page_is_nested_under_wp_page() {
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'page',
+ 'post_name' => 'foo',
+ ) );
+
+ $members_page = get_page_by_path( 'members' );
+ wp_update_post( array(
+ 'ID' => $members_page->ID,
+ 'post_parent' => $p,
+ ) );
+
+ $domain = home_url( $this->u->user_nicename );
+ $this->go_to( $domain );
+
+ $this->assertTrue( bp_is_user() );
+ $this->assertTrue( bp_is_my_profile() );
+ $this->assertEquals( $this->u->ID, bp_displayed_user_id() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_member_activity_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = home_url( $this->u->user_nicename ) . '/' . bp_get_activity_slug();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span></span></pre>
</div>
</div>
</body>
</html>