Changeset 13346

Timestamp:

10/26/2022 09:06:02 PM (2 years ago)

Author:

dcavins

Message:

Site invitations: Do not assume that a user exists.

In some BuddyPress setups, a user is not created
until the signup has been activated. This is the case
when BP_SIGNUPS_SKIP_USER_CREATION is set
to true or when BP is installed on a WodPress network.
So we rely on the BP_Signup instead of the dodgy
user_id in bp_members_invitations_complete_signup().

Fixes #8693.

File:

• trunk/src/bp-members/bp-members-invitations.php (modified) (3 diffs)

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

@@ -106 +106 @@
     $bp = buddypress();
 
-    if ( ! $user_id ) {
-        return;
-    }
-
     // Check to see if this signup is the result of a valid invitation.
     $invite = bp_get_members_invitation_from_request();
@@ -116 +112 @@
     }
 
-    // Accept the invitation.
-    $invites_class = new BP_Members_Invitation_Manager();
-    $args          = array(
-        'id' => $invite->id,
-    );
-    $invites_class->accept_invitation( $args );
-
     // User has already verified their email by responding to the invitation, so we can activate.
-    $key = bp_get_user_meta( $user_id, 'activation_key', true );
+    $signup = bp_members_get_signup_by( 'user_email', $invite->invitee_email );
+    $key = false;
+    if ( ! empty( $signup->activation_key ) ) {
+        $key = $signup->activation_key;
+    }
+
     if ( $key ) {
         $redirect = bp_get_activation_page();
@@ -137 +131 @@
          */
         $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $key ) );
+
+        // Accept the invitation now that the user has been created.
+        $invites_class = new BP_Members_Invitation_Manager();
+        $args          = array(
+            'id' => $invite->id,
+        );
+        $invites_class->accept_invitation( $args );
 
         // If there were errors, add a message and redirect.