Changeset 1947

Timestamp:

09/25/2009 06:40:35 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1077 but this is part of a wider search conflict problem that will need to be addressed in a future version.

Location:

trunk

Files:

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

trunk/bp-core.php

@@ -1533 +1533 @@
                 case 'members': default:
                     $slug = BP_MEMBERS_SLUG;
+                    $var = '/?s=';
                     break;
                 case 'groups':
                     $slug = BP_GROUPS_SLUG;
+                    $var = '/?s=';
                     break;
                 case 'forums':
                     $slug = BP_FORUMS_SLUG;
+                    $var = '/?fs=';
                     break;
                 case 'blogs':
                     $slug = BP_BLOGS_SLUG;
+                    $var = '/?s=';
                     break;
             }
         }
-
-        $search_url = apply_filters( 'bp_core_search_site', site_url( $slug . '/?s=' . urlencode($search_terms) ), $search_terms );
+        
+        $search_url = apply_filters( 'bp_core_search_site', site_url( $slug . $var . urlencode($search_terms) ), $search_terms );
         
         bp_core_redirect( $search_url );

trunk/bp-forums/bp-forums-templatetags.php

@@ -181 +181 @@
 
     /* If $_GET['s'] is set, let's auto populate the filter var */
-    if ( $bp->is_directory && !empty( $_GET['s'] ) )
-        $filter = $_GET['s'];
+    if ( $bp->is_directory && !empty( $_GET['fs'] ) )
+        $filter = $_GET['fs'];
         
     $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $per_page, $max, $no_stickies, $filter );
@@ -921 +921 @@
     global $bp; ?>
     <form action="<?php echo $bp->root_domain . '/' . $bp->forums->slug . '/'; ?>" method="get" id="search-forums-form">
-        <label><input type="text" name="s" id="forums_search" value="<?php if ( isset( $_GET['s'] ) ) { echo attribute_escape( $_GET['s'] ); } else { _e( 'Search anything...', 'buddypress' ); } ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+        <label><input type="text" name="fs" id="forums_search" value="<?php if ( isset( $_GET['fs'] ) ) { echo attribute_escape( $_GET['fs'] ); } else { _e( 'Search anything...', 'buddypress' ); } ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
         <input type="submit" id="forums_search_submit" name="submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
     </form>