Changeset 5302 for trunk/bp-activity/bp-activity-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-activity/bp-activity-functions.php (modified) (9 diffs)

trunk/bp-activity/bp-activity-functions.php

@@ -287 +287 @@
     // Fallback to logged in user if no user_id is passed
     if ( empty( $user_id ) )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     // Update the user's personal favorites
-    $my_favs   = bp_get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true );
+    $my_favs   = bp_get_user_meta( bp_loggedin_user_id(), 'bp_favorite_activities', true );
     $my_favs[] = $activity_id;
 
@@ -298 +298 @@
 
     // Update user meta
-    bp_update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs );
+    bp_update_user_meta( bp_loggedin_user_id(), 'bp_favorite_activities', $my_favs );
 
     // Update activity meta counts
@@ -345 +345 @@
     // Fallback to logged in user if no user_id is passed
     if ( empty( $user_id ) )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     // Remove the fav from the user's favs
@@ -431 +431 @@
     // Fallback on displayed user, and then logged in user
     if ( empty( $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();
 
     return BP_Activity_Activity::total_favorite_count( $user_id );
@@ -792 +792 @@
         'primary_link'      => '',    // Optional: The primary URL for this item in RSS feeds (defaults to activity permalink)
 
-        'user_id'           => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user.
+        'user_id'           => bp_loggedin_user_id(), // Optional: The user to record the activity for, can be false if this activity is not for a user.
         'item_id'           => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id
         'secondary_item_id' => false, // Optional: A second ID used to further filter e.g. a comment_id
@@ -863 +863 @@
     $defaults = array(
         'content' => false,
-        'user_id' => $bp->loggedin_user->id
+        'user_id' => bp_loggedin_user_id()
     );
     $r = wp_parse_args( $args, $defaults );
@@ -891 +891 @@
 
     // Add this update to the "latest update" usermeta so it can be fetched anywhere.
-    bp_update_user_meta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
+    bp_update_user_meta( bp_loggedin_user_id(), 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
 
     do_action( 'bp_activity_posted_update', $content, $user_id, $activity_id );
@@ -922 +922 @@
         'id'          => false,
         'content'     => false,
-        'user_id'     => $bp->loggedin_user->id,
+        'user_id'     => bp_loggedin_user_id(),
         'activity_id' => false, // ID of the root activity item
         'parent_id'   => false  // ID of a parent comment (optional)
@@ -1053 +1053 @@
     // Check if the user's latest update has been deleted
     if ( empty( $args['user_id'] ) )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
     else
         $user_id = $args['user_id'];