Changeset 5398

Timestamp:

11/27/2011 09:24:10 PM (13 years ago)

Author:

boonebgorges

Message:

When cross-referencing the bp_uri stack against paths in bp_core_set_uri_globals(), only remove matches that appear at the same index. Fixes #1726. Props sbrajesh for an early patch

File:

• trunk/bp-core/bp-core-catchuri.php (modified) (1 diff)

trunk/bp-core/bp-core-catchuri.php

@@ -113 +113 @@
         array_shift( $paths );
 
+    // Reset indexes
+    $bp_uri = array_values( $bp_uri );
+    $paths  = array_values( $paths );
+
     // Unset URI indices if they intersect with the paths
     foreach ( (array) $bp_uri as $key => $uri_chunk ) {
-        if ( in_array( $uri_chunk, $paths ) ) {
+        if ( isset( $paths[$key] ) && $uri_chunk == $paths[$key] ) {
             unset( $bp_uri[$key] );
         }
     }
-
+    
     // Reset the keys by merging with an empty array
     $bp_uri = array_merge( array(), $bp_uri );