Changeset 13945

Timestamp:

07/05/2024 02:02:54 AM (18 months ago)

Author:

imath

Message:

Site invitations: avoid duplicate activation emails

Props dcavins, vapvarun, emaralive

Fixes #9206

Location:

trunk/src/bp-members

Files:

• bp-members-invitations.php (modified) (1 diff)
• bp-members-membership-requests.php (modified) (1 diff)

trunk/src/bp-members/bp-members-invitations.php

@@ -158 +158 @@
     );
 
-    // If pending invitations exist, send the verification mail.
+    // If pending invitations exist, but we're not currently accepting an invite, send the verification mail.
     if ( $invites ) {
-        $send = true;
+        // Is the current request actually a response to an invitation?
+        $maybe_inv = bp_get_members_invitation_from_request();
+
+        // Not currently accepting a request.
+        if ( ! $maybe_inv->id ) {
+            $send = true;
+        }
     }
 

trunk/src/bp-members/bp-members-membership-requests.php

@@ -51 +51 @@
     $send = apply_filters( 'bp_members_membership_requests_bypass_manual_approval', false, $details );
 
-    // If the registration process has been interrupted, this is a new membership request.
-    if ( ! $send ) {
+    $invites = bp_members_invitations_get_invites(
+        array(
+            'invitee_email' => $user_email,
+            'invite_sent'   => 'sent'
+        )
+    );
+
+    // If the registration process has been interrupted, this is a new membership request or the user was accepting an invitation and we need not send an activation email.
+    if ( ! $send && ! $invites ) {
         $signup = bp_members_get_signup_by( 'activation_key', $activation_key );