Changeset 8329 for trunk/bp-groups/bp-groups-template.php

Timestamp:

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

Author:

johnjamesjacoby

Message:

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

File:

• trunk/bp-groups/bp-groups-template.php (modified) (3 diffs)

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