Changeset 5313

Timestamp:

11/08/2011 09:37:42 PM (13 years ago)

Author:

boonebgorges

Message:

Force ambiguous item URIs to resolve to their most specific versions, to avoid content duplication. Fixes #1741

Location:

trunk

Files:

• bp-blogs/bp-blogs-loader.php (modified) (1 diff)
• bp-core/bp-core-buddybar.php (modified) (2 diffs)
• bp-members/bp-members-loader.php (modified) (1 diff)

trunk/bp-blogs/bp-blogs-loader.php

@@ -110 +110 @@
             'position'            => 30,
             'screen_function'     => 'bp_blogs_screen_my_blogs',
-            'default_subnav_slug' => 'my-blogs',
+            'default_subnav_slug' => 'my-sites',
             'item_css_id'         => $this->id
         );
+        
+        $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
+        );
 
         // Setup navigation
-        parent::setup_nav( $main_nav );
+        parent::setup_nav( $main_nav, $sub_nav );
     }
 

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

@@ -70 +70 @@
             add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ), 3 );
 
-        if ( !empty( $default_subnav_slug ) )
-            $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
+        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 );
+            }
+        }
 
     // Look for current item
@@ -80 +90 @@
             add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ), 3 );
 
-        if ( !empty( $default_subnav_slug ) )
-            $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
+        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 );
+            }
+        }
     }
 

trunk/bp-members/bp-members-loader.php

@@ -115 +115 @@
         }
 
-        if ( !$bp->current_component && bp_displayed_user_id() )
-            $bp->current_component = $bp->default_component;
+        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;
+            }
+        }
     }