<!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][4360] trunk: Adds meta_key and meta_value params to bp_has_members() and related functions.</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, #logmsg > ol { margin-left: 0; 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>4360</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-05-15 15:01:28 +0000 (Sun, 15 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds meta_key and meta_value params to bp_has_members() and related functions. Fixes #3205</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (4359 => 4360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2011-05-15 10:18:53 UTC (rev 4359)
+++ trunk/bp-core/bp-core-classes.php 2011-05-15 15:01:28 UTC (rev 4360)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> /** Static Functions ******************************************************/
</span><span class="cx">
</span><del>- function get_users( $type, $limit = 0, $page = 1, $user_id = 0, $include = false, $search_terms = false, $populate_extras = true, $exclude = false ) {
</del><ins>+ function get_users( $type, $limit = 0, $page = 1, $user_id = 0, $include = false, $search_terms = false, $populate_extras = true, $exclude = false, $meta_key = false, $meta_value = false ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> $sql = array();
</span><span class="lines">@@ -124,11 +124,21 @@
</span><span class="cx">
</span><span class="cx"> if ( 'alphabetical' == $type )
</span><span class="cx"> $sql['select_alpha'] = ", pd.value as fullname";
</span><ins>+
+ if ( $meta_key ) {
+ $sql['select_meta'] = ", umm.meta_key";
+
+ if ( $meta_value )
+ $sql['select_meta'] .= ", umm.meta_value";
+ }
</ins><span class="cx">
</span><span class="cx"> $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
</span><span class="cx">
</span><span class="cx"> if ( $search_terms && bp_is_active( 'xprofile' ) || 'alphabetical' == $type )
</span><span class="cx"> $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
</span><ins>+
+ if ( $meta_key )
+ $sql['join_meta'] = "LEFT JOIN {$wpdb->usermeta} umm ON umm.user_id = u.ID";
</ins><span class="cx">
</span><span class="cx"> $sql['where'] = 'WHERE ' . bp_core_get_status_sql( 'u.' );
</span><span class="cx">
</span><span class="lines">@@ -174,6 +184,15 @@
</span><span class="cx"> $search_terms = like_escape( $wpdb->escape( $search_terms ) );
</span><span class="cx"> $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
</span><span class="cx"> }
</span><ins>+
+ if ( $meta_key ) {
+ $sql['where_meta'] = $wpdb->prepare( " AND umm.meta_key = %s", $meta_key );
+
+ // If a meta value is provided, match it
+ if ( $meta_value ) {
+ $sql['where_meta'] .= $wpdb->prepare( " AND umm.meta_value = %s", $meta_value );
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> switch ( $type ) {
</span><span class="cx"> case 'active': case 'online': default:
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (4359 => 4360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2011-05-15 10:18:53 UTC (rev 4359)
+++ trunk/bp-members/bp-members-functions.php 2011-05-15 15:01:28 UTC (rev 4360)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> 'user_id' => false, // Pass a user_id to limit to only friend connections for this user
</span><span class="cx"> 'exclude' => false, // Users to exclude from results
</span><span class="cx"> 'search_terms' => false, // Limit to users that match these search terms
</span><ins>+ 'meta_key' => false, // Limit to users who have this piece of usermeta
+ 'meta_value' => false, // With meta_key, limit to users where usermeta matches this value
</ins><span class="cx">
</span><span class="cx"> 'include' => false, // Pass comma separated list of user_ids to limit to only these users
</span><span class="cx"> 'per_page' => 20, // The number of results to return per page
</span><span class="lines">@@ -70,7 +72,7 @@
</span><span class="cx"> $params = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $params, EXTR_SKIP );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras, $exclude ), $params );
</del><ins>+ return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras, $exclude, $meta_key, $meta_value ), $params );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (4359 => 4360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2011-05-15 10:18:53 UTC (rev 4359)
+++ trunk/bp-members/bp-members-template.php 2011-05-15 15:01:28 UTC (rev 4360)
</span><span class="lines">@@ -139,11 +139,11 @@
</span><span class="cx"> var $pag_links;
</span><span class="cx"> var $total_member_count;
</span><span class="cx">
</span><del>- function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude ) {
- $this->__construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude );
</del><ins>+ function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value ) {
+ $this->__construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude ) {
</del><ins>+ function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> $this->pag_page = !empty( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : (int)$page_number;
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> else if ( false !== $include )
</span><span class="cx"> $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page, $populate_extras );
</span><span class="cx"> else
</span><del>- $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras, 'exclude' => $exclude ) );
</del><ins>+ $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras, 'exclude' => $exclude, 'meta_key' => $meta_key, 'meta_value' => $meta_value ) );
</ins><span class="cx">
</span><span class="cx"> if ( !$max || $max >= (int)$this->members['total'] )
</span><span class="cx"> $this->total_member_count = (int)$this->members['total'];
</span><span class="lines">@@ -267,6 +267,9 @@
</span><span class="cx">
</span><span class="cx"> 'user_id' => $user_id, // Pass a user_id to only show friends of this user
</span><span class="cx"> 'search_terms' => $search_terms, // Pass search_terms to filter users by their profile data
</span><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><span class="cx"> 'populate_extras' => true // Fetch usermeta? Friend count, last active etc.
</span><span class="cx"> );
</span><span class="lines">@@ -290,7 +293,7 @@
</span><span class="cx"> if ( empty( $include ) && bp_is_friends_component() && bp_is_current_action( 'requests' ) )
</span><span class="cx"> return false;
</span><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 );
</del><ins>+ $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 );
</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>