Changeset 11971 for trunk/src/bp-groups/actions/join.php

Timestamp:

04/13/2018 02:01:15 PM (7 years ago)

Author:

dcavins

Message:

Correct bp_user_can() logic error.

In r11776, I introduced a logic error in groups_action_join_group(). The logic should be that if a user can't simply join a group, then we check for outstadning invitations.

See #7610.

File:

• trunk/src/bp-groups/actions/join.php (modified) (1 diff)

trunk/src/bp-groups/actions/join.php

@@ -29 +29 @@
     if ( !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) && !groups_is_user_banned( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
 
-        // User wants to join a group that is not public.
-        if ( bp_current_user_can( 'groups_join_group', array( 'group_id' => $bp->groups->current_group->id ) ) ) {
+        // User wants to join a group that requires an invitation to join.
+        if ( ! bp_current_user_can( 'groups_join_group', array( 'group_id' => $bp->groups->current_group->id ) ) ) {
             if ( !groups_check_user_has_invite( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
                 bp_core_add_message( __( 'There was an error joining the group.', 'buddypress' ), 'error' );