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

trunk/bp-blogs/bp-blogs-functions.php

@@ -85 +85 @@
 
     if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     $name = get_blog_option( $blog_id, 'blogname' );
@@ -377 +377 @@
 
     if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     do_action( 'bp_blogs_before_remove_post', $blog_id, $post_id, $user_id );
@@ -394 +394 @@
     bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'secondary_item_id' => $comment_id, 'type' => 'new_blog_comment' ) );
 
-    do_action( 'bp_blogs_remove_comment', $wpdb->blogid, $comment_id, $bp->loggedin_user->id );
+    do_action( 'bp_blogs_remove_comment', $wpdb->blogid, $comment_id, bp_loggedin_user_id() );
 }
 add_action( 'delete_comment', 'bp_blogs_remove_comment' );
@@ -411 +411 @@
 
     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_blogs_for_user_' . $user_id, 'bp' ) ) {