<!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][5313] trunk: Force ambiguous item URIs to resolve to their most specific versions, to avoid content duplication.</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><a href="http://buddypress.trac.wordpress.org/changeset/5313">5313</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-11-08 21:37:42 +0000 (Tue, 08 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Force ambiguous item URIs to resolve to their most specific versions, to avoid content duplication. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/1741">#1741</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsloaderphp">trunk/bp-blogs/bp-blogs-loader.php</a></li>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpmembersbpmembersloaderphp">trunk/bp-members/bp-members-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-loader.php (5312 => 5313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-loader.php 2011-11-08 21:31:10 UTC (rev 5312)
+++ trunk/bp-blogs/bp-blogs-loader.php 2011-11-08 21:37:42 UTC (rev 5313)
</span><span class="lines">@@ -109,12 +109,23 @@
</span><span class="cx"> 'slug' => $this->slug,
</span><span class="cx"> 'position' => 30,
</span><span class="cx"> 'screen_function' => 'bp_blogs_screen_my_blogs',
</span><del>- 'default_subnav_slug' => 'my-blogs',
</del><ins>+ 'default_subnav_slug' => 'my-sites',
</ins><span class="cx"> 'item_css_id' => $this->id
</span><span class="cx"> );
</span><ins>+
+ $parent_url = trailingslashit( bp_displayed_user_domain() . bp_get_blogs_slug() );
+
+ $sub_nav[] = array(
+ 'name' => __( 'My Sites', 'buddypress' ),
+ 'slug' => 'my-sites',
+ 'parent_url' => $parent_url,
+ 'parent_slug' => $bp->blogs->slug,
+ 'screen_function' => 'bp_blogs_screen_my_blogs',
+ 'position' => 10
+ );
</ins><span class="cx">
</span><span class="cx"> // Setup navigation
</span><del>- parent::setup_nav( $main_nav );
</del><ins>+ parent::setup_nav( $main_nav, $sub_nav );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (5312 => 5313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2011-11-08 21:31:10 UTC (rev 5312)
+++ trunk/bp-core/bp-core-buddybar.php 2011-11-08 21:37:42 UTC (rev 5313)
</span><span class="lines">@@ -69,8 +69,18 @@
</span><span class="cx"> else
</span><span class="cx"> add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ), 3 );
</span><span class="cx">
</span><del>- if ( !empty( $default_subnav_slug ) )
- $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
</del><ins>+ if ( !empty( $default_subnav_slug ) ) {
+ /**
+ * BuddyPress will attempt to resolve to the most specific URL possible,
+ * to avoid search-engine-unfriendly content reduplication. Filter
+ * bp_guarantee_unique_uris (and return false) to avoid this behavior
+ */
+ if ( apply_filters( 'bp_guarantee_unique_uris', true ) ) {
+ bp_core_redirect( bp_displayed_user_domain() . $slug . '/' . apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r ) );
+ } else {
+ $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> // Look for current item
</span><span class="cx"> } elseif ( bp_is_current_item( $slug ) && !bp_current_action() ) {
</span><span class="lines">@@ -79,8 +89,18 @@
</span><span class="cx"> else
</span><span class="cx"> add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ), 3 );
</span><span class="cx">
</span><del>- if ( !empty( $default_subnav_slug ) )
- $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
</del><ins>+ if ( !empty( $default_subnav_slug ) ) {
+ /**
+ * BuddyPress will attempt to resolve to the most specific URL possible,
+ * to avoid search-engine-unfriendly content reduplication. Filter
+ * bp_guarantee_unique_uris (and return false) to avoid this behavior
+ */
+ if ( apply_filters( 'bp_guarantee_unique_uris', true ) ) {
+ bp_core_redirect( bp_get_root_domain() . '/' . bp_get_root_slug( bp_current_component() ) . '/' . $slug . '/' . apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r ) );
+ } else {
+ $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_core_new_nav_item', $r, $args, $defaults );
</span></span></pre></div>
<a id="trunkbpmembersbpmembersloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-loader.php (5312 => 5313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-loader.php 2011-11-08 21:31:10 UTC (rev 5312)
+++ trunk/bp-members/bp-members-loader.php 2011-11-08 21:37:42 UTC (rev 5313)
</span><span class="lines">@@ -114,8 +114,18 @@
</span><span class="cx"> $bp->default_component = BP_DEFAULT_COMPONENT;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !$bp->current_component && bp_displayed_user_id() )
- $bp->current_component = $bp->default_component;
</del><ins>+ if ( !bp_current_component() && bp_displayed_user_id() ) {
+ /**
+ * BuddyPress will attempt to resolve to the most specific URL possible,
+ * to avoid search-engine-unfriendly content reduplication. Filter
+ * bp_guarantee_unique_uris (and return false) to avoid this behavior
+ */
+ if ( apply_filters( 'bp_guarantee_unique_uris', true ) ) {
+ bp_core_redirect( bp_displayed_user_domain() . $bp->default_component );
+ } else {
+ $bp->current_component = $bp->default_component;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>