Ticket #1726: bp-core-catchuri.patch

bp-core-catchuri.php

@@ -43 +43 @@
         else
                 $path = clean_url( $_SERVER['REQUEST_URI'] );
 
-        $path = apply_filters( 'bp_uri', $path );
-
+    $path = apply_filters( 'bp_uri', $path );
         // Firstly, take GET variables off the URL to avoid problems,
         // they are still registered in the global $_GET variable */
         $noget = substr( $path, 0, strpos( $path, '?' ) );
@@ -52 +51 @@
 
         /* Fetch the current URI and explode each part separated by '/' into an array */
         $bp_uri = explode( "/", $path );
-
+  
         /* Loop and remove empties */
         foreach ( (array)$bp_uri as $key => $uri_chunk )
                 if ( empty( $bp_uri[$key] ) ) unset( $bp_uri[$key] );
-
+ 
         if ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) {
                 /* If we are running BuddyPress on any blog, not just a root blog, we need to first
                    shift off the blog name if we are running a subdirectory install of WPMU. */
@@ -74 +73 @@
 
         /* Get site path items */
         $paths = explode( '/', bp_core_get_site_path() );
+//strip off the empty elemnts which are generated because of slashes in the path
+        foreach ( (array)$paths  as $key => $uri_chunk )
+                if ( empty( $paths[$key] ) ) unset( $paths[$key] );
 
-        /* Take empties off the end of path */
-        if ( empty( $paths[count($paths) - 1] ) )
-                array_pop( $paths );
+//so we have $paths and $bp_uri array on same level
+$count=count($paths);
+array_splice($bp_uri, 0, $count);//now remove the paths section from the bp_uri
 
-        /* Take empties off the start of path */
-        if ( empty( $paths[0] ) )
-                array_shift( $paths );
 
-        foreach ( (array)$bp_uri as $key => $uri_chunk ) {
-                if ( in_array( $uri_chunk, $paths )) {
-                        unset( $bp_uri[$key] );
-                }
-        }
-
-        /* Reset the keys by merging with an empty array */
+/*  Reset the keys by merging with an empty array */
         $bp_uri = array_merge( array(), $bp_uri );
         $bp_unfiltered_uri = $bp_uri;