Changeset 5412 for trunk/bp-core/bp-core-buddybar.php

Timestamp:

11/29/2011 08:58:28 PM (15 years ago)

Author:

boonebgorges

Message:

Refactors URL canonicalization logic, moving it into the single bp_redirect_canonical() which is loaded from bp_core_load_template() instead of redirecting during the nav setup routine. See #1741. Combines all canonicalization into a single redirect. Fixes #3771. Ensures that query strings are preserved on redirects. Fixes #3777.

File:

• trunk/bp-core/bp-core-buddybar.php (modified) (2 diffs)

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

@@ -71 +71 @@
 
                 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 );
-                        }
+                        $bp->current_action           = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
+                        $bp->redirect_stack['action'] = $bp->current_action;
                 }
 
@@ -91 +83 @@
 
                 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 );
-                        }
+                        $bp->current_action           = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
+                        $bp->redirect_stack['action'] = $bp->current_action;
                 }
         }