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

trunk/bp-forums/bp-forums-functions.php

@@ -147 +147 @@
         'topic_slug'             => '',
         'topic_text'             => '',
-        'topic_poster'           => $bp->loggedin_user->id,       // accepts ids
+        'topic_poster'           => bp_loggedin_user_id(),       // accepts ids
         'topic_poster_name'      => $bp->loggedin_user->fullname, // accept names
-        'topic_last_poster'      => $bp->loggedin_user->id,       // accepts ids
+        'topic_last_poster'      => bp_loggedin_user_id(),       // accepts ids
         'topic_last_poster_name' => $bp->loggedin_user->fullname, // accept names
         'topic_start_time'       => bp_core_current_time(),
@@ -203 +203 @@
 
     // Check if the user is a spammer 
-    if ( bp_core_is_user_spammer( $bp->loggedin_user->id ) || bp_core_is_user_deleted( $bp->loggedin_user->id ) ) 
+    if ( bp_core_is_user_spammer( bp_loggedin_user_id() ) || bp_core_is_user_deleted( bp_loggedin_user_id() ) ) 
         return false;
 
@@ -316 +316 @@
 
     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 ( class_exists( 'BB_Query' ) ) {
@@ -488 +488 @@
         'post_text'     => '',
         'post_time'     => bp_core_current_time(),
-        'poster_id'     => $bp->loggedin_user->id, // accepts ids or names
+        'poster_id'     => bp_loggedin_user_id(), // accepts ids or names
         'poster_ip'     => $_SERVER['REMOTE_ADDR'],
         'post_status'   => 0, // use bb_delete_post() instead
@@ -515 +515 @@
         return false;
 
-    if ( bp_core_is_user_spammer( $bp->loggedin_user->id ) || bp_core_is_user_deleted( $bp->loggedin_user->id ) )
+    if ( bp_core_is_user_spammer( bp_loggedin_user_id() ) || bp_core_is_user_deleted( bp_loggedin_user_id() ) )
         return false;
 
@@ -576 +576 @@
     global $bp, $wp_roles, $bb_table_prefix;
 
-    if ( !isset( $bp->loggedin_user->id ) )
+    if ( !bp_loggedin_user_id() )
         return $allcaps;
 
-    $bb_cap = get_user_meta( $bp->loggedin_user->id, $bb_table_prefix . 'capabilities', true );
+    $bb_cap = get_user_meta( bp_loggedin_user_id(), $bb_table_prefix . 'capabilities', true );
 
     if ( empty( $bb_cap ) )