Changeset 5329 for trunk/bp-groups/bp-groups-screens.php
- Timestamp:
- 11/14/2011 05:19:12 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-groups/bp-groups-screens.php
r5302 r5329 130 130 $user_is_banned = false; 131 131 132 if ( ! is_super_admin() && groups_is_user_banned( bp_loggedin_user_id(), $bp->groups->current_group->id ) )132 if ( !bp_current_user_can( 'bp_moderate' ) && groups_is_user_banned( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) 133 133 $user_is_banned = true; 134 134 … … 141 141 142 142 // Auto join this user if they are not yet a member of this group 143 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 ) )143 if ( bp_groups_auto_join() && !bp_current_user_can( 'bp_moderate' ) && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) 144 144 groups_join_group( $bp->groups->current_group->id, bp_loggedin_user_id() ); 145 145 … … 338 338 $error_message = __( "You have been banned from this group.", 'buddypress' ); 339 339 340 } 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 ) ) {340 } elseif ( bp_groups_auto_join() && !bp_current_user_can( 'bp_moderate' ) && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) { 341 341 // Auto join this user if they are not yet a member of this group 342 342 groups_join_group( $bp->groups->current_group->id, bp_loggedin_user_id() ); … … 773 773 if ( bp_is_groups_component() && bp_is_action_variable( 'delete-group', 0 ) ) { 774 774 775 if ( !$bp->is_item_admin && ! is_super_admin() )775 if ( !$bp->is_item_admin && !bp_current_user_can( 'bp_moderate' ) ) 776 776 return false; 777 777
Note: See TracChangeset
for help on using the changeset viewer.