<!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][5990] trunk: When determining canonical URL for items such as groups, don't strip the default extension slug if it's not the last part of the URL.</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/5990">5990</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-04-14 19:54:22 +0000 (Sat, 14 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>When determining canonical URL for items such as groups, don't strip the default extension slug if it's not the last part of the URL. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4084">#4084</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (5989 => 5990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2012-04-14 19:54:15 UTC (rev 5989)
+++ trunk/bp-core/bp-core-buddybar.php 2012-04-14 19:54:22 UTC (rev 5990)
</span><span class="lines">@@ -78,12 +78,8 @@
</span><span class="cx"> // The requested URL has explicitly included the default subnav
</span><span class="cx"> // (eg: http://example.com/members/membername/activity/just-me/)
</span><span class="cx"> // The canonical version will not contain this subnav slug.
</span><del>- if ( !empty( $default_subnav_slug ) && bp_is_current_action( $default_subnav_slug ) ) {
-
- // bbPress 2.x uses pretty pagination, so whitelist 'page'
- if ( ! bp_is_action_variable( 'page', 0 ) && ! bp_action_variable( 1 ) ) {
- unset( $bp->canonical_stack['action'] );
- }
</del><ins>+ if ( !empty( $default_subnav_slug ) && bp_is_current_action( $default_subnav_slug ) && !bp_action_variable( 0 ) ) {
+ unset( $bp->canonical_stack['action'] );
</ins><span class="cx"> } elseif ( ! bp_current_action() ) {
</span><span class="cx"> $func = is_object( $screen_function[0] ) ? array( &$screen_function[0], $screen_function[1] ) : $screen_function;
</span><span class="cx"> add_action( 'bp_screens', $func, 3 );
</span><span class="lines">@@ -114,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $function = $bp->bp_nav[$parent_slug]['screen_function'] ) {
</span><span class="cx"> if ( is_object( $function[0] ) ) {
</span><span class="cx"> remove_action( 'bp_screens', array( &$function[0], $function[1] ), 3 );
</span><span class="lines">@@ -126,11 +122,11 @@
</span><span class="cx"> $bp->bp_nav[$parent_slug]['screen_function'] = &$screen_function;
</span><span class="cx">
</span><span class="cx"> if ( bp_is_current_component( $parent_slug ) ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // The only way to tell whether to set the subnav is to peek at the unfiltered_uri
</span><span class="cx"> // Find the component
</span><span class="cx"> $component_uri_key = array_search( $parent_slug, $bp->unfiltered_uri );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( false !== $component_uri_key ) {
</span><span class="cx"> if ( !empty( $bp->unfiltered_uri[$component_uri_key + 1] ) ) {
</span><span class="cx"> $unfiltered_action = $bp->unfiltered_uri[$component_uri_key + 1];
</span><span class="lines">@@ -145,7 +141,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> add_action( 'bp_screens', $screen_function, 3 );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $bp->current_action = $subnav_slug;
</span><span class="cx"> unset( $bp->canonical_stack['action'] );
</span><span class="cx"> }
</span><span class="lines">@@ -301,13 +297,13 @@
</span><span class="cx"> } else {
</span><span class="cx"> $redirect_to = trailingslashit( bp_displayed_user_domain() . ( 'xprofile' == $bp->profile->id ? 'profile' : $bp->profile->id ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $message = '';
</span><span class="cx"> } else {
</span><span class="cx"> $message = __( 'You do not have access to this page.', 'buddypress' );
</span><span class="cx"> $redirect_to = bp_displayed_user_domain();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Off-limits to this user. Throw an error and redirect to the displayed user's domain
</span><span class="cx"> bp_core_no_access( array(
</span><span class="cx"> 'message' => $message,
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (5989 => 5990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2012-04-14 19:54:15 UTC (rev 5989)
+++ trunk/bp-groups/bp-groups-loader.php 2012-04-14 19:54:22 UTC (rev 5990)
</span><span class="lines">@@ -171,6 +171,12 @@
</span><span class="cx">
</span><span class="cx"> if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
</span><span class="cx">
</span><ins>+ $this->default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
+
+ if ( !bp_current_action() ) {
+ $bp->current_action = $this->default_extension;
+ }
+
</ins><span class="cx"> // Prepare for a redirect to the canonical URL
</span><span class="cx"> $bp->canonical_stack['base_url'] = bp_get_group_permalink( $this->current_group );
</span><span class="cx">
</span><span class="lines">@@ -182,13 +188,13 @@
</span><span class="cx"> $bp->canonical_stack['action_variables'] = bp_action_variables();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
-
- if ( !bp_current_action() ) {
- $bp->current_action = $this->default_extension;
- } else if ( bp_is_current_action( $this->default_extension ) && !empty( $bp->action_variables ) ) {
</del><ins>+ // When viewing the default extension, the canonical URL should not have
+ // that extension's slug, unless more has been tacked onto the URL via
+ // action variables
+ if ( bp_is_current_action( $this->default_extension ) && empty( $bp->action_variables ) ) {
</ins><span class="cx"> unset( $bp->canonical_stack['action'] );
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Group access control
</span></span></pre>
</div>
</div>
</body>
</html>