Changeset 5990

Timestamp:

04/14/2012 07:54:22 PM (13 years ago)

Author:

boonebgorges

Message:

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 #4084

Location:

trunk

Files:

• bp-core/bp-core-buddybar.php (modified) (6 diffs)
• bp-groups/bp-groups-loader.php (modified) (2 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -79 +79 @@
         // (eg: http://example.com/members/membername/activity/just-me/)
         // The canonical version will not contain this subnav slug.
-        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'] );
-            }
+        if ( !empty( $default_subnav_slug ) && bp_is_current_action( $default_subnav_slug ) && !bp_action_variable( 0 ) ) {
+            unset( $bp->canonical_stack['action'] );
         } elseif ( ! bp_current_action() ) {
             $func = is_object( $screen_function[0] ) ? array( &$screen_function[0], $screen_function[1] ) : $screen_function;
@@ -115 +111 @@
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
-    
+
     if ( $function = $bp->bp_nav[$parent_slug]['screen_function'] ) {
         if ( is_object( $function[0] ) ) {
@@ -127 +123 @@
 
     if ( bp_is_current_component( $parent_slug ) ) {
-        
+
         // The only way to tell whether to set the subnav is to peek at the unfiltered_uri
         // Find the component
         $component_uri_key = array_search( $parent_slug, $bp->unfiltered_uri );
-        
+
         if ( false !== $component_uri_key ) {
             if ( !empty( $bp->unfiltered_uri[$component_uri_key + 1] ) ) {
@@ -146 +142 @@
                     add_action( 'bp_screens', $screen_function, 3 );
                 }
-        
+
                 $bp->current_action = $subnav_slug;
                 unset( $bp->canonical_stack['action'] );
@@ -302 +298 @@
                         $redirect_to = trailingslashit( bp_displayed_user_domain() . ( 'xprofile' == $bp->profile->id ? 'profile' : $bp->profile->id ) );
                     }
-                    
+
                     $message     = '';
                 } else {
@@ -308 +304 @@
                     $redirect_to = bp_displayed_user_domain();
                 }
-                
+
                 // Off-limits to this user. Throw an error and redirect to the displayed user's domain
                 bp_core_no_access( array(

trunk/bp-groups/bp-groups-loader.php

@@ -172 +172 @@
         if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
 
+            $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;
+            }
+
             // Prepare for a redirect to the canonical URL
             $bp->canonical_stack['base_url'] = bp_get_group_permalink( $this->current_group );
@@ -183 +189 @@
             }
 
-            $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 ) )  {
+            // 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 ) )  {
                 unset( $bp->canonical_stack['action'] );
             }
+
         }