Changeset 13160

Timestamp:

12/04/2021 03:18:04 PM (3 years ago)

Author:

imath

Message:

Legacy: allow invited users to join a group from the Groups Directory

Unlike BP Nouveau, the BP Legacy Template pack wasn't allowing an invited user to directly join a group from the Groups Directory. They had to accept the Group invites. Both template pack are now behaving the same, leaving users to directly join a group without replying to the corresponding group invite.

Props mandro

Fixes #8574

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1537 +1537 @@
     $group_id = (int) $_POST['gid'];
 
-    if ( groups_is_user_banned( bp_loggedin_user_id(), $group_id ) )
-        return;
-
-    if ( ! $group = groups_get_group( $group_id ) )
-        return;
+    if ( groups_is_user_banned( bp_loggedin_user_id(), $group_id ) ) {
+        return;
+    }
+
+    $group = groups_get_group( $group_id );
+
+    if ( ! $group ) {
+        return;
+    }
+
+    $action = '';
+    if ( isset( $_POST['action'] ) ) {
+        $action = sanitize_key( wp_unslash( $_POST['action'] ) );
+    }
 
     // Client doesn't distinguish between different request types, so we infer from user status.
     if ( groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
         $request_type = 'leave_group';
-    } elseif ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) ) {
+    } elseif ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) && 'joinleave_group' !== $action ) {
         $request_type = 'accept_invite';
     } elseif ( 'private' === $group->status ) {