Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
11/14/2011 05:19:12 AM (13 years ago)
Author:
johnjamesjacoby
Message:

Find/replace on is_super_admin() to use bp_current_user_can( 'bp_moderate' ). See #3740.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-groups/bp-groups-screens.php

    r5302 r5329  
    130130        $user_is_banned = false;
    131131
    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 ) )
    133133            $user_is_banned = true;
    134134
     
    141141
    142142                // 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 ) )
    144144                    groups_join_group( $bp->groups->current_group->id, bp_loggedin_user_id() );
    145145
     
    338338                    $error_message = __( "You have been banned from this group.", 'buddypress' );
    339339
    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 ) ) {
    341341                    // Auto join this user if they are not yet a member of this group
    342342                    groups_join_group( $bp->groups->current_group->id, bp_loggedin_user_id() );
     
    773773    if ( bp_is_groups_component() && bp_is_action_variable( 'delete-group', 0 ) ) {
    774774
    775         if ( !$bp->is_item_admin && !is_super_admin() )
     775        if ( !$bp->is_item_admin && !bp_current_user_can( 'bp_moderate' ) )
    776776            return false;
    777777
Note: See TracChangeset for help on using the changeset viewer.