Changeset 8294

Timestamp:

04/18/2014 05:02:15 PM (11 years ago)

Author:

imath

Message:

In BP_Signup::activate(), make sure the user ID is defined before checking user_status

When Activating a signup from the Signups management screen, in case of an error, we need to first try to get the user id before checking his status.

Fixes #5559

File:

• trunk/bp-members/bp-members-classes.php (modified) (1 diff)

trunk/bp-members/bp-members-classes.php

@@ -566 +566 @@
             if ( ! empty( $user->errors ) ) {
 
-                $user_id = username_exists( $signup->user_login ) && 2 != self::check_user_status( $user_id );
-
-                if ( !empty( $user_id ) ) {
+                $user_id = username_exists( $signup->user_login );
+
+                if ( 2 !== self::check_user_status( $user_id ) ) {
+                    $user_id = false;
+                }
+
+                if ( empty( $user_id ) ) {
 
                     // Status is not 2, so user's account has been activated