Changeset 5302 for trunk/bp-themes/bp-default/_inc/ajax.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-themes/bp-default/_inc/ajax.php (modified) (11 diffs)

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -40 +40 @@
     if ( !empty( $_BP_COOKIE['bp-' . $object . '-scope'] ) ) {
         if ( 'personal' == $_BP_COOKIE['bp-' . $object . '-scope'] ) {
-            $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();
             $qs[] = 'user_id=' . $user_id;
         }
@@ -126 +126 @@
         case 'mentions':
             $feed_url = $bp->loggedin_user->domain . bp_get_activity_slug() . '/mentions/feed/';
-            bp_activity_clear_new_mentions( $bp->loggedin_user->id );
+            bp_activity_clear_new_mentions( bp_loggedin_user_id() );
             break;
         default:
@@ -298 +298 @@
 
     /* Check access */
-    if ( !is_super_admin() && $comment->user_id != $bp->loggedin_user->id )
+    if ( !is_super_admin() && $comment->user_id != bp_loggedin_user_id() )
         return false;
 
@@ -424 +424 @@
         return false;
 
-    if ( !friends_check_friendship( $bp->loggedin_user->id, $_POST['friend_id'] ) )
+    if ( !friends_check_friendship( bp_loggedin_user_id(), $_POST['friend_id'] ) )
         return false;
 
@@ -460 +460 @@
     global $bp;
 
-    if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
+    if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
 
         check_ajax_referer('friends_remove_friend');
 
-        if ( !friends_remove_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
+        if ( !friends_remove_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
             echo __("Friendship could not be canceled.", 'buddypress');
         } else {
@@ -470 +470 @@
         }
 
-    } else if ( 'not_friends' == BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
+    } else if ( 'not_friends' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
 
         check_ajax_referer('friends_add_friend');
 
-        if ( !friends_add_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
+        if ( !friends_add_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
             echo __("Friendship could not be requested.", 'buddypress');
         } else {
@@ -513 +513 @@
     global $bp;
 
-    if ( groups_is_user_banned( $bp->loggedin_user->id, $_POST['gid'] ) )
+    if ( groups_is_user_banned( bp_loggedin_user_id(), $_POST['gid'] ) )
         return false;
 
@@ -519 +519 @@
         return false;
 
-    if ( !groups_is_user_member( $bp->loggedin_user->id, $group->id ) ) {
+    if ( !groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
 
         if ( 'public' == $group->status ) {
@@ -535 +535 @@
             check_ajax_referer( 'groups_request_membership' );
 
-            if ( !groups_send_membership_request( $bp->loggedin_user->id, $group->id ) ) {
+            if ( !groups_send_membership_request( bp_loggedin_user_id(), $group->id ) ) {
                 _e( 'Error requesting membership', 'buddypress' );
             } else {
@@ -688 +688 @@
             $user_ids = array();
             foreach( $users['users'] as $user ) {
-                if ( $user->id != $bp->loggedin_user->id )
+                if ( $user->id != bp_loggedin_user_id() )
                     $user_ids[] = $user->id;
             }
@@ -696 +696 @@
     } else {
         if ( bp_is_active( 'friends' ) ) {
-            $users = friends_search_friends( $_GET['q'], $bp->loggedin_user->id, $limit, 1 );
+            $users = friends_search_friends( $_GET['q'], bp_loggedin_user_id(), $limit, 1 );
 
             // Keeping the bp_friends_autocomplete_list filter for backward compatibility