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

trunk/bp-blogs/bp-blogs-classes.php

@@ -78 +78 @@
         global $bp, $wpdb;
 
-        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != bp_loggedin_user_id() ) ) )
             $hidden_sql = "AND wb.public = 1";
         else
@@ -133 +133 @@
 
         if ( !$user_id )
-            $user_id = $bp->loggedin_user->id;
+            $user_id = bp_loggedin_user_id();
 
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE user_id = %d AND blog_id = %d", $user_id, $blog_id ) );
@@ -142 +142 @@
 
         if ( !$user_id )
-            $user_id = $bp->loggedin_user->id;
+            $user_id = bp_loggedin_user_id();
 
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
@@ -195 +195 @@
 
         // If the user is logged in return the blog count including their hidden blogs.
-        if ( ( is_user_logged_in() && $user_id == $bp->loggedin_user->id ) || is_super_admin() )
+        if ( ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) || is_super_admin() )
             return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id) );
         else