Ticket #3842: 3842-concept.diff

src/bp-groups/bp-groups-functions.php

@@ -957 +957 @@
  * @return BP_Groups_Group The current group object.
  */
 function groups_get_current_group() {
+        global $groups_template;
         $bp = buddypress();
+        $current_group = false;
 
-        $current_group = isset( $bp->groups->current_group )
-                ? $bp->groups->current_group
-                : false;
+        // Check the template first, in case we're in a groups loop inside of a group.
+        if ( ! empty( $groups_template->group ) && ( $groups_template->group instanceof BP_Groups_Group) ) {
+                $current_group = $groups_template->group;
+        // Next we check the bp global.
+        } elseif ( ! empty( $bp->groups->current_group ) && ( $bp->groups->current_group instanceof BP_Groups_Group ) ) {
+                $current_group = $bp->groups->current_group;
+        }
 
         /**
          * Filters the BP_Groups_Group object corresponding to the current group.

src/bp-groups/bp-groups-template.php

@@ -643 +643 @@
          * @return string
          */
         function bp_get_group_name( $group = false ) {
-                global $groups_template;
 
-                if ( empty( $group ) ) {
-                        $group =& $groups_template->group;
+                if ( ! ( $group instanceof BP_Groups_Group ) ) {
+                        $group = groups_get_current_group();
                 }
 
                 /**