Changeset 3490

Timestamp:

11/28/2010 03:49:00 PM (14 years ago)

Author:

boonebgorges

Message:

Modifies bp_core_set_uri_globals() to properly catch search requests. Fixes #2710

Location:

trunk

Files:

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

trunk/bp-core.php

@@ -22 +22 @@
 if ( !defined( 'CUSTOM_USER_META_TABLE' ) )
     define( 'CUSTOM_USER_META_TABLE', $wpdb->base_prefix . 'usermeta' );
+
+// The search slug has to be defined nice and early because of the way search requests are loaded
+if ( !defined( 'BP_SEARCH_SLUG' ) )
+        define( 'BP_SEARCH_SLUG', 'search' );
 
 /* Load the files containing functions that we globally will need. */
@@ -203 +207 @@
     if ( !defined( 'BP_ACTIVATION_SLUG' ) )
         define( 'BP_ACTIVATION_SLUG', $bp->pages->activate->slug );
-
-    if ( !defined( 'BP_SEARCH_SLUG' ) )
-        define( 'BP_SEARCH_SLUG', 'search' );
 }
 add_action( 'bp_setup_globals', 'bp_core_define_slugs' );

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

@@ -140 +140 @@
         unset( $uri_chunks );
     }
-
+    
+    // Search doesn't have an associated page, so we check for it separately
+    if ( BP_SEARCH_SLUG == $bp_uri[0] )
+        $matches[] = 1;
+        
     // This is not a BuddyPress page, so just return.
     if ( !isset( $matches ) )