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

Timestamp:

02/10/2015 02:49:16 AM (11 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-functions.php (modified) (9 diffs)

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

@@ -21 +21 @@
  * @since BuddyPress (1.5.0)
  *
- * @global BuddyPress $bp The one true BuddyPress instance
  * @return bool True if set, False if empty
  */
 function bp_groups_has_directory() {
-    global $bp;
+    $bp = buddypress();
 
     return (bool) !empty( $bp->pages->groups->id );
@@ -301 +300 @@
  */
 function groups_is_valid_status( $status ) {
-    global $bp;
+    $bp = buddypress();
 
     return in_array( $status, (array) $bp->groups->valid_status );
@@ -313 +312 @@
  */
 function groups_check_slug( $slug ) {
-    global $bp;
+    $bp = buddypress();
 
     if ( 'wp' == substr( $slug, 0, 2 ) )
@@ -365 +364 @@
  */
 function groups_leave_group( $group_id, $user_id = 0 ) {
-    global $bp;
 
     if ( empty( $user_id ) )
@@ -399 +397 @@
  */
 function groups_join_group( $group_id, $user_id = 0 ) {
-    global $bp;
 
     if ( empty( $user_id ) )
@@ -427 +424 @@
     if ( !$new_member->save() )
         return false;
+
+    $bp = buddypress();
 
     if ( !isset( $bp->groups->current_group ) || !$bp->groups->current_group || $group_id != $bp->groups->current_group->id )
@@ -705 +704 @@
  */
 function groups_get_current_group() {
-    global $bp;
-
-    $current_group = isset( $bp->groups->current_group ) ? $bp->groups->current_group : false;
+    $bp = buddypress();
+
+    $current_group = isset( $bp->groups->current_group )
+        ? $bp->groups->current_group
+        : false;
 
     return apply_filters( 'groups_get_current_group', $current_group );
@@ -722 +723 @@
  */
 function groups_avatar_upload_dir( $group_id = 0 ) {
-    global $bp;
-
-    if ( !$group_id )
-        $group_id = $bp->groups->current_group->id;
+
+    if ( empty( $group_id ) ) {
+        $group_id = bp_get_current_group_id();
+    }
 
     $path    = bp_core_avatar_upload_path() . '/group-avatars/' . $group_id;
@@ -810 +811 @@
  */
 function groups_post_update( $args = '' ) {
-    global $bp;
+    $bp = buddypress();
 
     $defaults = array(