Ticket #4154: 4154.diff

bp-core/bp-core-filters.php

@@ -271 +271 @@
         if ( is_front_page() || is_home() )
                 return $title;
 
+        // If this is the search page of the site, return WP's title
+        if ( is_search() )
+                return $title;
+
         $title = '';
 
         // Displayed user

bp-core/bp-core-functions.php

@@ -606 +606 @@
  * @param string $slug The slug to redirect to for searching.
  */
 function bp_core_action_search_site( $slug = '' ) {
+        global $bp;
 
         if ( !bp_is_current_component( bp_get_search_slug() ) )
                 return;
-
-        if ( empty( $_POST['search-terms'] ) ) {
+        
+        if ( empty( $_POST['search-terms'] ) && count( $bp->unfiltered_uri ) == 1 ) {
                 bp_core_redirect( bp_get_root_domain() );
                 return;
         }
 
+        // To allow for pretty search URLs e.g. /search/term/
+        if(count($bp->unfiltered_uri) > 1 )
+                return;
+
         $search_terms = stripslashes( $_POST['search-terms'] );
         $search_which = !empty( $_POST['search-which'] ) ? $_POST['search-which'] : '';
         $query_string = '/?s=';

bp-core/bp-core-catchuri.php

@@ -427 +427 @@
         if ( !empty( $bp->no_status_set ) )
                 return false;
 
+        // If is_search() is set pass through to native WP search
+        if ( is_search() )
+                return false;
+
         if ( !isset( $wp_query->queried_object ) && !bp_is_blog_page() ) {
                 bp_do_404();
         }