<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2378] trunk:
Fixes #1606 - remove persistent search on directories as this is confusing
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2378</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-20 10:24:30 +0000 (Wed, 20 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1606 - remove persistent search on directories as this is confusing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatetagsphp">trunk/bp-forums/bp-forums-templatetags.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatetagsphp">trunk/bp-groups/bp-groups-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2377 => 2378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-20 10:08:04 UTC (rev 2377)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-20 10:24:30 UTC (rev 2378)
</span><span class="lines">@@ -365,9 +365,6 @@
</span><span class="cx"> if ( !empty( $_GET['s'] ) )
</span><span class="cx"> $search_value = $_GET['s'];
</span><span class="cx">
</span><del>- else if ( !empty( $_COOKIE['bp-members-search-terms'] ) && 'false' != $_COOKIE['bp-members-search-terms'] )
- $search_value = $_COOKIE['bp-members-search-terms'];
-
</del><span class="cx"> ?>
</span><span class="cx"> <form action="" method="get" id="search-members-form">
</span><span class="cx"> <label><input type="text" name="s" id="members_search" value="<?php echo attribute_escape( $search_value ) ?>" onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-templatetags.php (2377 => 2378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php 2010-01-20 10:08:04 UTC (rev 2377)
+++ trunk/bp-forums/bp-forums-templatetags.php 2010-01-20 10:24:30 UTC (rev 2378)
</span><span class="lines">@@ -949,9 +949,6 @@
</span><span class="cx"> if ( !empty( $_REQUEST['fs'] ) )
</span><span class="cx"> $search_value = $_REQUEST['fs'];
</span><span class="cx">
</span><del>- else if ( !empty( $_COOKIE['bp-forums-search-terms'] ) && 'false' != $_COOKIE['bp-forums-search-terms'] )
- $search_value = $_COOKIE['bp-forums-search-terms'];
-
</del><span class="cx"> ?>
</span><span class="cx"> <form action="" method="get" id="search-forums-form">
</span><span class="cx"> <label><input type="text" name="s" id="forums_search" value="<?php echo attribute_escape($search_value) ?>" onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (2377 => 2378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-01-20 10:08:04 UTC (rev 2377)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-01-20 10:24:30 UTC (rev 2378)
</span><span class="lines">@@ -1673,9 +1673,6 @@
</span><span class="cx"> if ( !empty( $_REQUEST['s'] ) )
</span><span class="cx"> $search_value = $_REQUEST['s'];
</span><span class="cx">
</span><del>- else if ( !empty( $_COOKIE['bp-groups-search-terms'] ) && 'false' != $_COOKIE['bp-groups-search-terms'] )
- $search_value = $_COOKIE['bp-groups-search-terms'];
-
</del><span class="cx"> ?>
</span><span class="cx"> <form action="" method="get" id="search-groups-form">
</span><span class="cx"> <label><input type="text" name="s" id="groups_search" value="<?php echo attribute_escape($search_value) ?>" onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2377 => 2378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-20 10:08:04 UTC (rev 2377)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-20 10:24:30 UTC (rev 2378)
</span><span class="lines">@@ -11,20 +11,20 @@
</span><span class="cx">
</span><span class="cx"> /* Members */
</span><span class="cx"> if ( j('div.members').length )
</span><del>- bp_filter_request( j.cookie('bp-members-type'), j.cookie('bp-members-filter'), 'members', 'div.members', 1, j.cookie('bp-members-search-terms') );
</del><ins>+ bp_filter_request( j.cookie('bp-members-type'), j.cookie('bp-members-filter'), 'members', 'div.members' );
</ins><span class="cx">
</span><span class="cx"> /* Groups */
</span><span class="cx"> if ( j('div.groups').length )
</span><del>- bp_filter_request( j.cookie('bp-groups-type'), j.cookie('bp-groups-filter'), 'groups', 'div.groups', 1, j.cookie('bp-groups-search-terms') );
</del><ins>+ bp_filter_request( j.cookie('bp-groups-type'), j.cookie('bp-groups-filter'), 'groups', 'div.groups' );
</ins><span class="cx">
</span><span class="cx"> /* Blogs */
</span><span class="cx"> if ( j('div.blogs').length )
</span><del>- bp_filter_request( j.cookie('bp-blogs-type'), j.cookie('bp-blogs-filter'), 'blogs', 'div.blogs', 1, j.cookie('bp-blogs-search-terms') );
</del><ins>+ bp_filter_request( j.cookie('bp-blogs-type'), j.cookie('bp-blogs-filter'), 'blogs', 'div.blogs' );
</ins><span class="cx">
</span><span class="cx"> /* Forums */
</span><span class="cx"> if ( j('div.forums').length ) {
</span><span class="cx"> j('div#new-topic-post').hide();
</span><del>- bp_filter_request( j.cookie('bp-forums-type'), j.cookie('bp-forums-filter'), 'forums', 'div.forums', 1, j.cookie('bp-forums-search-terms') );
</del><ins>+ bp_filter_request( j.cookie('bp-forums-type'), j.cookie('bp-forums-filter'), 'forums', 'div.forums' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* @message Compose Scrolling */
</span></span></pre>
</div>
</div>
</body>
</html>