Changeset 9471 for trunk/src/bp-groups/bp-groups-actions.php

Timestamp:

02/10/2015 02:49:16 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace all remaining $bp global touches with buddypress().

All existing tests continue to pass as normal. I will further manually scrutinize each replacement to ensure correctness.

Fixes #5138. Any stragglers or updates will reference this ticket.

File:

• trunk/src/bp-groups/bp-groups-actions.php (modified) (5 diffs)

trunk/src/bp-groups/bp-groups-actions.php

@@ -96 +96 @@
  */
 function groups_action_create_group() {
-    global $bp;
 
     // If we're not at domain.org/groups/create/ then return false
@@ -109 +108 @@
         bp_core_redirect( bp_get_groups_directory_permalink() );
     }
+
+    $bp = buddypress();
 
     // Make sure creation steps are in the right order
@@ -361 +362 @@
  */
 function groups_action_join_group() {
-    global $bp;
 
     if ( !bp_is_single_item() || !bp_is_groups_component() || !bp_is_current_action( 'join' ) )
@@ -369 +369 @@
     if ( !check_admin_referer( 'groups_join_group' ) )
         return false;
+
+    $bp = buddypress();
 
     // Skip if banned or already a member
@@ -457 +459 @@
  */
 function groups_action_sort_creation_steps() {
-    global $bp;
 
     if ( !bp_is_groups_component() || !bp_is_current_action( 'create' ) )
         return false;
+
+    $bp = buddypress();
 
     if ( !is_array( $bp->groups->group_creation_steps ) )