<!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][12744] trunk: Support status parameter in bp_has_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 { white-space: pre-line; 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/12744">12744</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/12744","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-09 13:25:47 +0000 (Fri, 09 Oct 2020)</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'>Support status parameter in bp_has_groups().
Allow a `status` parameter to be passed through `bp_has_groups()` to its underlying function, `groups_has_groups()`.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8310">#8310</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupstemplatephp">trunk/src/bp-groups/classes/class-bp-groups-template.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupstemplatephp">trunk/tests/phpunit/testcases/groups/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2020-10-09 05:13:56 UTC (rev 12743)
+++ trunk/src/bp-groups/bp-groups-template.php 2020-10-09 13:25:47 UTC (rev 12744)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,6 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0 Added `$group_type`, `$group_type__in`, and `$group_type__not_in` parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0 Added `$update_admin_cache` parameter.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 7.0.0 Added `$status` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Array of parameters. All items are optional.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,6 +320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $group_type__in Array or comma-separated list of group types to limit results to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $group_type__not_in Array or comma-separated list of group types that will be
</span><span class="cx" style="display: block; padding: 0 10px"> * excluded from results.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type array|string $status Array or comma-separated list of group statuses to limit results to.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type array $meta_query An array of meta_query conditions.
</span><span class="cx" style="display: block; padding: 0 10px"> * See {@link WP_Meta_Query::queries} for description.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $include Array or comma-separated list of group IDs. Results will be limited
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,6 +374,16 @@
</span><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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status = array();
+ if ( ! empty( $_GET['status'] ) ) {
+ if ( is_array( $_GET['status'] ) ) {
+ $status = $_GET['status'];
+ } else {
+ // Can be a comma-separated list.
+ $status = explode( ',', $_GET['status'] );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Default search string (too soon to escape here).
</span><span class="cx" style="display: block; padding: 0 10px"> $search_query_arg = bp_core_get_component_search_query_arg( 'groups' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST[ $search_query_arg ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,6 +410,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => $group_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => $status,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,6 +435,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => $r['group_type'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => $r['group_type__in'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => $r['group_type__not_in'],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => $r['status'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => $r['meta_query'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => $r['include'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => $r['exclude'],
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupstemplatephp"></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-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-template.php 2020-10-09 05:13:56 UTC (rev 12743)
+++ trunk/src/bp-groups/classes/class-bp-groups-template.php 2020-10-09 13:25:47 UTC (rev 12744)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,6 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_meta_cache' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_admin_cache' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,6 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => $group_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => $group_type__in,
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => $group_type__not_in,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => $status,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'include' => $include,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => $exclude,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_id' => $parent_id,
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/groups/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/template.php 2020-10-09 05:13:56 UTC (rev 12743)
+++ trunk/tests/phpunit/testcases/groups/template.php 2020-10-09 13:25:47 UTC (rev 12744)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,6 +120,33 @@
</span><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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test using the 'status' parameter in bp_has_groups()
+ *
+ * @group bp_has_groups
+ */
+ public function test_bp_has_groups_status() {
+ $g1 = self::factory()->group->create( array(
+ 'status' => 'public',
+ ) );
+ $g2 = self::factory()->group->create( array(
+ 'status' => 'private',
+ ) );
+ $g3 = self::factory()->group->create( array(
+ 'status' => 'hidden',
+ ) );
+
+ global $groups_template;
+ bp_has_groups( array(
+ 'status' => 'private',
+ ) );
+
+ $ids = wp_parse_id_list( wp_list_pluck( $groups_template->groups, 'id' ) );
+ $this->assertEqualSets( array( $g2 ), $ids );
+
+ $this->assertEquals( 1, $groups_template->group_count );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group hierarchical_groups
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_has_groups_parent_id() {
</span></span></pre>
</div>
</div>
</body>
</html>