<!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] [3449] trunk: Add missing files from previous commit (r3448);
don't allow the URL to override search parameters hardcoded in templates.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3449</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-11-19 19:41:13 +0000 (Fri, 19 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add missing files from previous commit (r3448); don't allow the URL to override search parameters hardcoded in templates.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatetagsphp">trunk/bp-groups/bp-groups-templatetags.php</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 (3448 => 3449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-11-19 19:39:29 UTC (rev 3448)
+++ trunk/bp-core/bp-core-templatetags.php 2010-11-19 19:41:13 UTC (rev 3449)
</span><span class="lines">@@ -123,16 +123,12 @@
</span><span class="cx"> $type = 'active';
</span><span class="cx"> $user_id = false;
</span><span class="cx"> $page = 1;
</span><del>- $search_terms = false;
</del><ins>+ $search_terms = null;
</ins><span class="cx">
</span><span class="cx"> // User filtering
</span><span class="cx"> if ( !empty( $bp->displayed_user->id ) )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><del>- // Pass a filter if ?s= is set.
- if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
- $search_terms = $_REQUEST['s'];
-
</del><span class="cx"> // type: active ( default ) | random | newest | popular | online | alphabetical
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'type' => $type,
</span><span class="lines">@@ -152,6 +148,14 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r );
</span><span class="cx">
</span><ins>+ // Pass a filter if ?s= is set.
+ if ( is_null( $search_terms ) ) {
+ if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
+ $search_terms = $_REQUEST['s'];
+ else
+ $search_terms = false;
+ }
+
</ins><span class="cx"> if ( $max ) {
</span><span class="cx"> if ( $per_page > $max )
</span><span class="cx"> $per_page = $max;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (3448 => 3449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-11-19 19:39:29 UTC (rev 3448)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-11-19 19:41:13 UTC (rev 3449)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> */
</span><span class="cx"> $type = 'active';
</span><span class="cx"> $user_id = false;
</span><del>- $search_terms = false;
</del><ins>+ $search_terms = null;
</ins><span class="cx"> $slug = false;
</span><span class="cx">
</span><span class="cx"> /* User filtering */
</span><span class="lines">@@ -159,9 +159,6 @@
</span><span class="cx"> $slug = $bp->groups->current_group->slug;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset( $_REQUEST['group-filter-box'] ) || isset( $_REQUEST['s'] ) )
- $search_terms = ( isset( $_REQUEST['group-filter-box'] ) ) ? $_REQUEST['group-filter-box'] : $_REQUEST['s'];
-
</del><span class="cx"> $defaults = array(
</span><span class="cx"> 'type' => $type,
</span><span class="cx"> 'page' => 1,
</span><span class="lines">@@ -180,6 +177,15 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r );
</span><span class="cx">
</span><ins>+ if ( is_null( $search_terms ) ) {
+ if ( isset( $_REQUEST['group-filter-box'] ) && !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"> $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, $include, (bool)$populate_extras, $exclude );
</span><span class="cx"> return apply_filters( 'bp_has_groups', $groups_template->has_groups(), &$groups_template );
</span><span class="cx"> }
</span><span class="lines">@@ -1811,7 +1817,7 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> $search_value = __( 'Search anything...', 'buddypress' );
</span><del>- if ( !empty( $_REQUEST['s'] ) )
</del><ins>+ if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
</ins><span class="cx"> $search_value = $_REQUEST['s'];
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>