<!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][8328] branches/2.0: Backwards compatibility for querying single groups via the `slug` argument.</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/8328">8328</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-04-28 23:21:00 +0000 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Backwards compatibility for querying single groups via the `slug` argument. Props r-a-y. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5596">#5596</a>. (2.0 branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches20bpgroupsbpgroupstemplatephp">branches/2.0/bp-groups/bp-groups-template.php</a></li>
<li><a href="#branches20teststestcasesgroupstemplatephp">branches/2.0/tests/testcases/groups/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches20bpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: branches/2.0/bp-groups/bp-groups-template.php (8327 => 8328)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.0/bp-groups/bp-groups-template.php 2014-04-28 23:11:38 UTC (rev 8327)
+++ branches/2.0/bp-groups/bp-groups-template.php 2014-04-28 23:21:00 UTC (rev 8328)
</span><span class="lines">@@ -159,9 +159,29 @@
</span><span class="cx"> if ( 'invites' == $type ) {
</span><span class="cx"> $this->groups = groups_get_invites_for_user( $user_id, $this->pag_num, $this->pag_page, $exclude );
</span><span class="cx"> } else if ( 'single-group' == $type ) {
</span><del>- $group = new stdClass;
- $group->group_id = bp_get_current_group_id();
- $this->groups = array( $group );
</del><ins>+ $this->single_group = true;
+
+ if ( groups_get_current_group() ) {
+ $group = groups_get_current_group();
+
+ } else {
+ $group = groups_get_group( array(
+ 'group_id' => BP_Groups_Group::get_id_from_slug( $r['slug'] ),
+ 'populate_extras' => $r['populate_extras'],
+ ) );
+ }
+
+ // backwards compatibility - the 'group_id' variable is not part of the
+ // BP_Groups_Group object, but we add it here for devs doing checks against it
+ //
+ // @see https://buddypress.trac.wordpress.org/changeset/3540
+ //
+ // this is subject to removal in a future release; devs should check against
+ // $group->id instead
+ $group->group_id = $group->id;
+
+ $this->groups = array( $group );
+
</ins><span class="cx"> } else {
</span><span class="cx"> $this->groups = groups_get_groups( array(
</span><span class="cx"> 'type' => $type,
</span><span class="lines">@@ -185,9 +205,13 @@
</span><span class="cx"> $this->group_count = (int) $this->groups['total'];
</span><span class="cx"> $this->groups = $this->groups['groups'];
</span><span class="cx"> } else if ( 'single-group' == $type ) {
</span><del>- $this->single_group = true;
- $this->total_group_count = 1;
- $this->group_count = 1;
</del><ins>+ if ( empty( $group->id ) ) {
+ $this->total_group_count = 0;
+ $this->group_count = 0;
+ } else {
+ $this->total_group_count = 1;
+ $this->group_count = 1;
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> if ( empty( $max ) || $max >= (int) $this->groups['total'] ) {
</span><span class="cx"> $this->total_group_count = (int) $this->groups['total'];
</span><span class="lines">@@ -260,9 +284,6 @@
</span><span class="cx"> $this->in_the_loop = true;
</span><span class="cx"> $this->group = $this->next_group();
</span><span class="cx">
</span><del>- if ( $this->single_group )
- $this->group = groups_get_current_group();
-
</del><span class="cx"> if ( 0 == $this->current_group ) // loop has just started
</span><span class="cx"> do_action('group_loop_start');
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches20teststestcasesgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: branches/2.0/tests/testcases/groups/template.php (8327 => 8328)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.0/tests/testcases/groups/template.php 2014-04-28 23:11:38 UTC (rev 8327)
+++ branches/2.0/tests/testcases/groups/template.php 2014-04-28 23:21:00 UTC (rev 8328)
</span><span class="lines">@@ -99,6 +99,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Test using the 'slug' parameter in bp_has_groups()
+ *
+ * Note: The 'slug' parameter currently also requires the 'type' to be set
+ * to 'single-group'.
+ *
+ * @group bp_has_groups
+ */
+ public function test_bp_has_groups_single_group_with_slug() {
+ $g1 = $this->factory->group->create( array(
+ 'name' => 'Test Group',
+ 'slug' => 'test-group',
+ 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 100 ),
+ ) );
+
+ global $groups_template;
+ bp_has_groups( array(
+ 'type' => 'single-group',
+ 'slug' => 'test-group',
+ ) );
+
+ $ids = wp_parse_id_list( wp_list_pluck( $groups_template->groups, 'id' ) );
+ $this->assertEquals( array( $g1 ), $ids );
+
+ $this->assertEquals( 1, $groups_template->group_count );
+ }
+
+ /**
</ins><span class="cx"> * @group bp_group_has_members
</span><span class="cx"> */
</span><span class="cx"> public function test_bp_group_has_members_vanilla() {
</span></span></pre>
</div>
</div>
</body>
</html>