<!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" />
<title>[BuddyPress][8116] trunk/bp-groups/bp-groups-template.php: Auto-fetch URL search parameters in bp_has_groups() before parsing $args array</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8116">8116</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-12 18:46:44 +0000 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Auto-fetch URL search parameters in bp_has_groups() before parsing $args array
Our previous method, of getting the search term out of $_REQUEST, had the
effect of overriding any search terms that were passed to the bp_has_groups()
function. Among other problems, this made it impossible to get an unfiltered
group list when looking at a page that was using an 's' parameter for something
else.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5456">#5456</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (8115 => 8116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2014-03-11 23:04:25 UTC (rev 8115)
+++ trunk/bp-groups/bp-groups-template.php 2014-03-12 18:46:44 UTC (rev 8116)
</span><span class="lines">@@ -311,6 +311,15 @@
</span><span class="cx"> $slug = $bp->groups->current_group->slug;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Default search string
+ if ( ! empty( $_REQUEST['group-filter-box'] ) ) {
+ $search_terms = $_REQUEST['group-filter-box'];
+ } elseif ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) ) {
+ $search_terms = $_REQUEST['s'];
+ } else {
+ $search_terms = false;
+ }
+
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'type' => $type, // 'type' is an override for 'order' and 'orderby'. See docblock.
</span><span class="cx"> 'order' => 'DESC',
</span><span class="lines">@@ -324,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> 'user_id' => $user_id, // Pass a user ID to limit to groups this user has joined
</span><span class="cx"> 'slug' => $slug, // Pass a group slug to only return that group
</span><del>- 'search_terms' => '', // Pass search terms to return only matching groups
</del><ins>+ 'search_terms' => $search_terms, // Pass search terms to return only matching groups
</ins><span class="cx"> 'meta_query' => false, // Filter by groupmeta. See WP_Meta_Query for format
</span><span class="cx"> 'include' => false, // Pass comma separated list or array of group ID's to return only these groups
</span><span class="cx"> 'exclude' => false, // Pass comma separated list or array of group ID's to exclude these groups
</span><span class="lines">@@ -335,15 +344,6 @@
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><del>- if ( empty( $r['search_terms'] ) ) {
- if ( isset( $_REQUEST['group-filter-box'] ) && !empty( $_REQUEST['group-filter-box'] ) )
- $r['search_terms'] = $_REQUEST['group-filter-box'];
- elseif ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
- $r['search_terms'] = $_REQUEST['s'];
- else
- $r['search_terms'] = false;
- }
-
</del><span class="cx"> $groups_template = new BP_Groups_Template( array(
</span><span class="cx"> 'type' => $r['type'],
</span><span class="cx"> 'order' => $r['order'],
</span></span></pre>
</div>
</div>
</body>
</html>