Changeset 5302 for trunk/bp-groups/bp-groups-functions.php

Timestamp:

11/08/2011 01:24:47 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Use bp_loggedin_user_id() rather than reference the $bp->logged_user->id global var directly. Second step at consolidating user ID checks to use WP_User class later. See #3738.

File:

• trunk/bp-groups/bp-groups-functions.php (modified) (8 diffs)

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

@@ -63 +63 @@
         $group->creator_id = $creator_id;
     else
-        $group->creator_id = $bp->loggedin_user->id;
+        $group->creator_id = bp_loggedin_user_id();
 
     if ( isset( $name ) )
@@ -248 +248 @@
 
     if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     // Don't let single admins leave the group.
@@ -289 +289 @@
 
     if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     // Check if the user has an outstanding invite, is so delete it.
@@ -407 +407 @@
 
     if ( !$user_id )
-        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
+        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
 
     if ( !$count = wp_cache_get( 'bp_total_groups_for_user_' . $user_id, 'bp' ) ) {
@@ -491 +491 @@
     $defaults = array(
         'content'  => false,
-        'user_id'  => $bp->loggedin_user->id,
+        'user_id'  => bp_loggedin_user_id(),
         'group_id' => 0
     );
@@ -534 +534 @@
 
     if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     return BP_Groups_Member::get_invites( $user_id, $limit, $page, $exclude );
@@ -545 +545 @@
         'user_id'       => false,
         'group_id'      => false,
-        'inviter_id'    => $bp->loggedin_user->id,
+        'inviter_id'    => bp_loggedin_user_id(),
         'date_modified' => bp_core_current_time(),
         'is_confirmed'  => 0
@@ -634 +634 @@
 
     if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     // Send friend invites.