<!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][11792] trunk/src/bp-groups: Groups: add support to query for members from multiple groups.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/11792">11792</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11792","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-04 16:05:39 +0000 (Thu, 04 Jan 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Groups: add support to query for members from multiple groups.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7573">#7573</a>
Props r-a-y, dcavins</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupmemberqueryphp">trunk/src/bp-groups/classes/class-bp-group-member-query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2018-01-04 15:36:24 UTC (rev 11791)
+++ trunk/src/bp-groups/bp-groups-functions.php 2018-01-04 16:05:39 UTC (rev 11792)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,25 +641,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * returning true.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 3.0.0 $group_id now supports multiple values. Only works if legacy query is not
+ * in use.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * An array of optional arguments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type int $group_id ID of the group whose members are being queried.
- * Default: current group ID.
- * @type int $page Page of results to be queried. Default: 1.
- * @type int $per_page Number of items to return per page of results.
- * Default: 20.
- * @type int $max Optional. Max number of items to return.
- * @type array $exclude Optional. Array of user IDs to exclude.
- * @type bool|int $value True (or 1) to exclude admins and mods from results.
- * Default: 1.
- * @type bool|int $value True (or 1) to exclude banned users from results.
- * Default: 1.
- * @type array $group_role Optional. Array of group roles to include.
- * @type string $search_terms Optional. Filter results by a search string.
- * @type string $type Optional. Sort the order of results. 'last_joined',
- * 'first_joined', or any of the $type params available
- * in {@link BP_User_Query}. Default: 'last_joined'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int|array|string $group_id ID of the group to limit results to. Also accepts multiple values
+ * either as an array or as a comma-delimited string.
+ * @type int $page Page of results to be queried. Default: 1.
+ * @type int $per_page Number of items to return per page of results. Default: 20.
+ * @type int $max Optional. Max number of items to return.
+ * @type array $exclude Optional. Array of user IDs to exclude.
+ * @type bool|int $exclude_admins_mods True (or 1) to exclude admins and mods from results. Default: 1.
+ * @type bool|int $exclude_banned True (or 1) to exclude banned users from results. Default: 1.
+ * @type array $group_role Optional. Array of group roles to include.
+ * @type string $search_terms Optional. Filter results by a search string.
+ * @type string $type Optional. Sort the order of results. 'last_joined', 'first_joined', or
+ * any of the $type params available in {@link BP_User_Query}. Default:
+ * 'last_joined'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false|array Multi-d array of 'members' list and 'count'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupmemberqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-group-member-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-group-member-query.php 2018-01-04 15:36:24 UTC (rev 11791)
+++ trunk/src/bp-groups/classes/class-bp-group-member-query.php 2018-01-04 16:05:39 UTC (rev 11792)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,20 +24,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * inviter_id = 0 (and invite_sent = 0).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 3.0.0 $group_id now supports multiple values.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Array of arguments. Accepts all arguments from
</span><span class="cx" style="display: block; padding: 0 10px"> * {@link BP_User_Query}, with the following additions:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type int $group_id ID of the group to limit results to.
- * @type array $group_role Array of group roles to match ('member',
- * 'mod', 'admin', 'banned').
- * Default: array( 'member' ).
- * @type bool $is_confirmed Whether to limit to confirmed members.
- * Default: true.
- * @type string $type Sort order. Accepts any value supported by
- * {@link BP_User_Query}, in addition to 'last_joined'
- * and 'first_joined'. Default: 'last_joined'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int|array|string $group_id ID of the group to limit results to. Also accepts multiple values
+ * either as an array or as a comma-delimited string.
+ * @type array $group_role Array of group roles to match ('member', 'mod', 'admin', 'banned').
+ * Default: array( 'member' ).
+ * @type bool $is_confirmed Whether to limit to confirmed members. Default: true.
+ * @type string $type Sort order. Accepts any value supported by {@link BP_User_Query}, in
+ * addition to 'last_joined' and 'first_joined'. Default: 'last_joined'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class BP_Group_Member_Query extends BP_User_Query {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +136,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* WHERE clauses *****************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Group id.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sql['where'][] = $wpdb->prepare( "group_id = %d", $this->query_vars['group_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group_ids = wp_parse_id_list( $this->query_vars['group_id'] );
+ $group_ids = implode( ',', $group_ids );
+ $sql['where'][] = "group_id IN ({$group_ids})";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If is_confirmed.
</span><span class="cx" style="display: block; padding: 0 10px"> $is_confirmed = ! empty( $this->query_vars['is_confirmed'] ) ? 1 : 0;
</span></span></pre>
</div>
</div>
</body>
</html>