Changeset 2378

Timestamp:

01/20/2010 10:24:30 AM (15 years ago)

Author:

apeatling

Message:

Fixes #1606 - remove persistent search on directories as this is confusing.

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)

trunk/bp-core/bp-core-templatetags.php

@@ -365 +365 @@
     if ( !empty( $_GET['s'] ) )
         $search_value = $_GET['s'];
-
-    else if ( !empty( $_COOKIE['bp-members-search-terms'] ) && 'false' != $_COOKIE['bp-members-search-terms'] )
-        $search_value = $_COOKIE['bp-members-search-terms'];
 
     ?>

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

@@ -950 +950 @@
         $search_value = $_REQUEST['fs'];
 
-    else if ( !empty( $_COOKIE['bp-forums-search-terms'] ) && 'false' != $_COOKIE['bp-forums-search-terms'] )
-        $search_value = $_COOKIE['bp-forums-search-terms'];
-
 ?>
     <form action="" method="get" id="search-forums-form">

trunk/bp-groups/bp-groups-templatetags.php

@@ -1674 +1674 @@
         $search_value = $_REQUEST['s'];
 
-    else if ( !empty( $_COOKIE['bp-groups-search-terms'] ) && 'false' != $_COOKIE['bp-groups-search-terms'] )
-        $search_value = $_COOKIE['bp-groups-search-terms'];
-
 ?>
     <form action="" method="get" id="search-groups-form">

trunk/bp-themes/bp-default/_inc/global.js

@@ -12 +12 @@
     /* Members */
     if ( j('div.members').length )
-        bp_filter_request( j.cookie('bp-members-type'), j.cookie('bp-members-filter'), 'members', 'div.members', 1, j.cookie('bp-members-search-terms') );
+        bp_filter_request( j.cookie('bp-members-type'), j.cookie('bp-members-filter'), 'members', 'div.members' );
 
     /* Groups */
     if ( j('div.groups').length )
-        bp_filter_request( j.cookie('bp-groups-type'), j.cookie('bp-groups-filter'), 'groups', 'div.groups', 1, j.cookie('bp-groups-search-terms') );
+        bp_filter_request( j.cookie('bp-groups-type'), j.cookie('bp-groups-filter'), 'groups', 'div.groups' );
 
     /* Blogs */
     if ( j('div.blogs').length )
-        bp_filter_request( j.cookie('bp-blogs-type'), j.cookie('bp-blogs-filter'), 'blogs', 'div.blogs', 1, j.cookie('bp-blogs-search-terms') );
+        bp_filter_request( j.cookie('bp-blogs-type'), j.cookie('bp-blogs-filter'), 'blogs', 'div.blogs' );
 
     /* Forums */
     if ( j('div.forums').length ) {
         j('div#new-topic-post').hide();
-        bp_filter_request( j.cookie('bp-forums-type'), j.cookie('bp-forums-filter'), 'forums', 'div.forums', 1, j.cookie('bp-forums-search-terms') );
+        bp_filter_request( j.cookie('bp-forums-type'), j.cookie('bp-forums-filter'), 'forums', 'div.forums' );
     }