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

Timestamp:

02/25/2014 02:45:49 PM (11 years ago)

Author:

boonebgorges

Message:

Fix global variable clashes in bp_group_has_invites()

The use of extract( $r, EXTR_SKIP ) in bp_group_has_invites() was preventing
the 'group_id' parameter passed to the function from being set in the global
and from being passed to the template class. This made the function impossible
to use outside the group context.

Fixes #5427

File:

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

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

@@ -3148 +3148 @@
 
 function bp_group_has_invites( $args = '' ) {
-    global $bp, $invites_template, $group_id;
+    global $invites_template, $group_id;
 
     $defaults = array(
@@ -3156 +3156 @@
 
     $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-
-    if ( !$group_id ) {
-        // Backwards compatibility
-        if ( !empty( $bp->groups->current_group ) )
-            $group_id = $bp->groups->current_group->id;
-
-        if ( !empty( $bp->groups->new_group_id ) )
-            $group_id = $bp->groups->new_group_id;
-    }
-
-    if ( !$group_id )
+
+    if ( empty( $r['group_id'] ) ) {
+        if ( ! empty( buddypress()->groups->current_group ) ) {
+            $r['group_id'] = bp_get_current_group_id();
+        } else if ( ! empty( buddypress()->groups->new_group_id ) ) {
+            $r['group_id'] = buddypress()->groups->new_group_id;
+        }
+    }
+
+    // Set the global (for use in BP_Groups_Invite_Template::the_invite())
+    if ( empty( $group_id ) ) {
+        $group_id = $r['group_id'];
+    }
+
+    if ( ! $group_id ) {
         return false;
-
-    $invites_template = new BP_Groups_Invite_Template( $user_id, $group_id );
+    }
+
+    $invites_template = new BP_Groups_Invite_Template( $r['user_id'], $r['group_id'] );
     return apply_filters( 'bp_group_has_invites', $invites_template->has_invites(), $invites_template );
 }