<!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] [2586] trunk/bp-themes/bp-default:
Fixing filter select on profile page objects.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2586</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-04 13:16:01 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing filter select on profile page objects.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleblogsphp">trunk/bp-themes/bp-default/members/single/blogs.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglegroupsphp">trunk/bp-themes/bp-default/members/single/groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (2585 => 2586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-02-04 12:31:13 UTC (rev 2585)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-02-04 13:16:01 UTC (rev 2586)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> if ( !empty( $_POST['page'] ) && '-1' != $_POST['page'] )
</span><span class="cx"> $qs[] = 'page=' . $_POST['page'];
</span><span class="cx">
</span><del>- if ( !empty( $_POST['search_terms'] ) && __( 'Search anything...', 'buddypress' ) != $_POST['search_terms'] && 'false' != $_POST['search_terms'] )
</del><ins>+ if ( !empty( $_POST['search_terms'] ) && __( 'Search anything...', 'buddypress' ) != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
</ins><span class="cx"> $qs[] = 'search_terms=' . $_POST['search_terms'];
</span><span class="cx">
</span><span class="cx"> /* Now pass the querystring to override default values. */
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2585 => 2586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-02-04 12:31:13 UTC (rev 2585)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-02-04 13:16:01 UTC (rev 2586)
</span><span class="lines">@@ -519,8 +519,14 @@
</span><span class="cx"> var object = css_id[0];
</span><span class="cx"> var scope = css_id[1];
</span><span class="cx"> var filter = j(this).val();
</span><del>- var search_terms = j("#" + object + "_search").val();
</del><ins>+ var search_terms = false;
</ins><span class="cx">
</span><ins>+ if ( j('div.dir-search input').length )
+ search_terms = j('div.dir-search input').val();
+
+ if ( 'friends' == object )
+ object = 'members';
+
</ins><span class="cx"> bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1, j.cookie('bp-' + object + '-extras') );
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1044,7 +1050,7 @@
</span><span class="cx"> /* Setup object scope and filter based on the current cookie settings for the object. */
</span><span class="cx"> function bp_init_objects(objects) {
</span><span class="cx"> j(objects).each( function(i) {
</span><del>- if ( null != j.cookie('bp-' + objects[i] + '-filter') && j('div.' + objects[i]).length )
</del><ins>+ if ( null != j.cookie('bp-' + objects[i] + '-filter') && j('li#' + objects[i] + '-order-select select').length )
</ins><span class="cx"> j('li#' + objects[i] + '-order-select select option[value=' + j.cookie('bp-' + objects[i] + '-filter') + ']').attr( 'selected', 'selected' );
</span><span class="cx">
</span><span class="cx"> if ( null != j.cookie('bp-' + objects[i] + '-scope') && j('div.' + objects[i]).length ) {
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/blogs.php (2585 => 2586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/blogs.php 2010-02-04 12:31:13 UTC (rev 2585)
+++ trunk/bp-themes/bp-default/members/single/blogs.php 2010-02-04 13:16:01 UTC (rev 2586)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <ul>
</span><span class="cx"> <?php bp_get_options_nav() ?>
</span><span class="cx">
</span><del>- <li id="blogs-filter-select" class="last filter">
</del><ins>+ <li id="blogs-order-select" class="last filter">
</ins><span class="cx"> <?php _e( 'Order By:', 'buddypress' ) ?>
</span><span class="cx"> <select id="blogs-all">
</span><span class="cx"> <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglegroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/groups.php (2585 => 2586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/groups.php 2010-02-04 12:31:13 UTC (rev 2585)
+++ trunk/bp-themes/bp-default/members/single/groups.php 2010-02-04 13:16:01 UTC (rev 2586)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( 'invites' != bp_current_action() ) : ?>
</span><del>- <li id="members-order-select" class="last filter">
</del><ins>+ <li id="groups-order-select" class="last filter">
</ins><span class="cx">
</span><span class="cx"> <?php _e( 'Order By:', 'buddypress' ) ?>
</span><span class="cx"> <select id="groups-all">
</span></span></pre>
</div>
</div>
</body>
</html>