Changeset 5302 for trunk/bp-groups/bp-groups-screens.php

Timestamp:

11/08/2011 01:24:47 AM (15 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-groups/bp-groups-screens.php (modified) (11 diffs)

trunk/bp-groups/bp-groups-screens.php

@@ -27 +27 @@
         // Delete group request notifications for the user
         if ( isset( $_GET['n'] ) ) {
-                bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_accepted' );
-                bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_rejected' );
-                bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_mod'      );
-                bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_admin'    );
+                bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'membership_request_accepted' );
+                bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'membership_request_rejected' );
+                bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'member_promoted_to_mod'      );
+                bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'member_promoted_to_admin'    );
         }
 
@@ -89 +89 @@
         if ( bp_is_single_item() ) {
                 if ( isset( $_GET['n'] ) ) {
-                        bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_accepted' );
-                        bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_rejected' );
-                        bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_mod'      );
-                        bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_admin'    );
+                        bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'membership_request_accepted' );
+                        bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'membership_request_rejected' );
+                        bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'member_promoted_to_mod'      );
+                        bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'member_promoted_to_admin'    );
                 }
 
@@ -130 +130 @@
                 $user_is_banned = false;
 
-                if ( !is_super_admin() && groups_is_user_banned( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                if ( !is_super_admin() && groups_is_user_banned( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
                         $user_is_banned = true;
 
@@ -141 +141 @@
 
                                 // Auto join this user if they are not yet a member of this group
-                                if ( bp_groups_auto_join() && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
-                                        groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
+                                if ( bp_groups_auto_join() && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
+                                        groups_join_group( $bp->groups->current_group->id, bp_loggedin_user_id() );
 
                                 $topic_page = isset( $_GET['topic_page'] ) ? $_GET['topic_page'] : false;
@@ -219 +219 @@
 
                                 /* Check the logged in user can delete this topic */
-                                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$topic->topic_poster )
+                                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$topic->topic_poster )
                                         bp_core_redirect( wp_get_referer() );
 
@@ -242 +242 @@
 
                                 // Check the logged in user can edit this topic
-                                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$topic->topic_poster )
+                                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$topic->topic_poster )
                                         bp_core_redirect( wp_get_referer() );
 
@@ -269 +269 @@
 
                                 // Check the logged in user can edit this topic
-                                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$post->poster_id )
+                                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$post->poster_id )
                                         bp_core_redirect( wp_get_referer() );
 
@@ -292 +292 @@
 
                                 // Check the logged in user can edit this topic
-                                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$post->poster_id )
+                                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$post->poster_id )
                                         bp_core_redirect( wp_get_referer() );
 
@@ -338 +338 @@
                                         $error_message = __( "You have been banned from this group.", 'buddypress' );
 
-                                } elseif ( bp_groups_auto_join() && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+                                } elseif ( bp_groups_auto_join() && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
                                         // Auto join this user if they are not yet a member of this group
-                                        groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
+                                        groups_join_group( $bp->groups->current_group->id, bp_loggedin_user_id() );
                                 }
 
@@ -402 +402 @@
 
                         // Send the invites.
-                        groups_send_invites( $bp->loggedin_user->id, $bp->groups->current_group->id );
+                        groups_send_invites( bp_loggedin_user_id(), $bp->groups->current_group->id );
                         bp_core_add_message( __('Group invites sent.', 'buddypress') );
                         do_action( 'groups_screen_group_invite', $bp->groups->current_group->id );
@@ -430 +430 @@
                                 return false;
 
-                        if ( !groups_send_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+                        if ( !groups_send_membership_request( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
                                 bp_core_add_message( __( 'There was an error sending your group membership request, please try again.', 'buddypress' ), 'error' );
                         } else {