<!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][8973] trunk/src/bp-members/bp-members-template.php: Clean up `bp_has_members()`:</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/8973">8973</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-09-02 18:40:37 +0000 (Tue, 02 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up `bp_has_members()`:
* Remove `explode()` usage
* Remove unused default variables
* Consolidate one-time use variables
* No functional changes at this time</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmemberstemplatephp">trunk/src/bp-members/bp-members-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-template.php (8972 => 8973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-template.php 2014-08-29 22:30:39 UTC (rev 8972)
+++ trunk/src/bp-members/bp-members-template.php 2014-09-02 18:40:37 UTC (rev 8973)
</span><span class="lines">@@ -429,15 +429,8 @@
</span><span class="cx"> function bp_has_members( $args = '' ) {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- /***
- * Set the defaults based on the current page. Any of these will be overridden
- * if arguments are directly passed into the loop. Custom plugins should always
- * pass their parameters directly to the loop.
- */
- $type = 'active';
- $user_id = 0;
- $page = 1;
- $search_terms = null;
</del><ins>+ // Default user ID
+ $user_id = 0;
</ins><span class="cx">
</span><span class="cx"> // User filtering
</span><span class="cx"> if ( bp_is_user_friends() && ! bp_is_user_friend_requests() ) {
</span><span class="lines">@@ -445,42 +438,56 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // type: active ( default ) | random | newest | popular | online | alphabetical
</span><del>- $defaults = array(
- 'type' => $type,
- 'page' => $page,
</del><ins>+ $r = bp_parse_args( $args, array(
+ 'type' => 'active',
+ 'page' => 1,
</ins><span class="cx"> 'per_page' => 20,
</span><span class="cx"> 'max' => false,
</span><span class="cx">
</span><del>- 'page_arg' => 'upage', // See https://buddypress.trac.wordpress.org/ticket/3679
</del><ins>+ 'page_arg' => 'upage', // See https://buddypress.trac.wordpress.org/ticket/3679
</ins><span class="cx">
</span><del>- 'include' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to only show these users
- 'exclude' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to exclude these users
</del><ins>+ 'include' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to only show these users
+ 'exclude' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to exclude these users
</ins><span class="cx">
</span><del>- 'user_id' => $user_id, // Pass a user_id to only show friends of this user
- 'search_terms' => $search_terms, // Pass search_terms to filter users by their profile data
</del><ins>+ 'user_id' => $user_id, // Pass a user_id to only show friends of this user
+ 'search_terms' => null, // Pass search_terms to filter users by their profile data
</ins><span class="cx">
</span><del>- 'meta_key' => false, // Only return users with this usermeta
- 'meta_value' => false, // Only return users where the usermeta value matches. Requires meta_key
</del><ins>+ 'meta_key' => false, // Only return users with this usermeta
+ 'meta_value' => false, // Only return users where the usermeta value matches. Requires meta_key
</ins><span class="cx">
</span><del>- 'populate_extras' => true // Fetch usermeta? Friend count, last active etc.
- );
</del><ins>+ 'populate_extras' => true // Fetch usermeta? Friend count, last active etc.
+ ), 'has_members' );
</ins><span class="cx">
</span><del>- $r = bp_parse_args( $args, $defaults, 'has_members' );
- extract( $r );
-
</del><span class="cx"> // Pass a filter if ?s= is set.
</span><del>- if ( is_null( $search_terms ) ) {
- if ( !empty( $_REQUEST['s'] ) )
- $search_terms = $_REQUEST['s'];
- else
- $search_terms = false;
</del><ins>+ if ( is_null( $r['search_terms'] ) ) {
+ if ( !empty( $_REQUEST['s'] ) ) {
+ $r['search_terms'] = $_REQUEST['s'];
+ } else {
+ $r['search_terms'] = false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Set per_page to max if max is larger than per_page
</span><del>- if ( !empty( $max ) && ( $per_page > $max ) )
- $per_page = $max;
</del><ins>+ if ( !empty( $r['max'] ) && ( $r['per_page'] > $r['max'] ) ) {
+ $r['per_page'] = $r['max'];
+ }
</ins><span class="cx">
</span><del>- $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude, $meta_key, $meta_value, $page_arg );
</del><ins>+ // Query for members and populate $members_template global
+ $members_template = new BP_Core_Members_Template(
+ $r['type'],
+ $r['page'],
+ $r['per_page'],
+ $r['max'],
+ $r['user_id'],
+ $r['search_terms'],
+ $r['include'],
+ $r['populate_extras'],
+ $r['exclude'],
+ $r['meta_key'],
+ $r['meta_value'],
+ $r['page_arg']
+ );
+
</ins><span class="cx"> return apply_filters( 'bp_has_members', $members_template->has_members(), $members_template );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>