Changeset 8329

Timestamp:

04/28/2014 11:24:06 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Backwards compatibility for querying single groups via the slug argument. Props r-a-y. Fixes #5596. (trunk)

Location:

trunk

Files:

• bp-groups/bp-groups-template.php (modified) (3 diffs)
• tests/testcases/groups/template.php (modified) (1 diff)

trunk/bp-groups/bp-groups-template.php

@@ -160 +160 @@
             $this->groups = groups_get_invites_for_user( $user_id, $this->pag_num, $this->pag_page, $exclude );
         } else if ( 'single-group' == $type ) {
-            $group           = new stdClass;
-            $group->group_id = bp_get_current_group_id();
-            $this->groups    = array( $group );
+            $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 );
+
         } else {
             $this->groups = groups_get_groups( array(
@@ -186 +206 @@
             $this->groups            = $this->groups['groups'];
         } else if ( 'single-group' == $type ) {
-            $this->single_group      = true;
-            $this->total_group_count = 1;
-            $this->group_count       = 1;
+            if ( empty( $group->id ) ) {
+                $this->total_group_count = 0;
+                $this->group_count       = 0;
+            } else {
+                $this->total_group_count = 1;
+                $this->group_count       = 1;
+            }
         } else {
             if ( empty( $max ) || $max >= (int) $this->groups['total'] ) {
@@ -260 +284 @@
         $this->in_the_loop = true;
         $this->group       = $this->next_group();
-
-        if ( $this->single_group )
-            $this->group = groups_get_current_group();
 
         if ( 0 == $this->current_group ) // loop has just started

trunk/tests/testcases/groups/template.php

@@ -97 +97 @@
         $ids = wp_parse_id_list( wp_list_pluck( $groups_template->groups, 'id' ) );
         $this->assertEquals( array( $g1, $g3, $g2, ), $ids );
+    }
+
+    /**
+     * 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 );
     }