Changeset 3622 for trunk/bp-core/bp-core-signup.php

Timestamp:

12/30/2010 09:13:14 PM (14 years ago)

Author:

boonebgorges

Message:

Improves error reporting after account activation. Along with ​[WP16954], fixes #2784. Props wpmuguru.

File:

• trunk/bp-core/bp-core-signup.php (modified) (3 diffs)

trunk/bp-core/bp-core-signup.php

@@ -223 +223 @@
         $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
 
-        /* If there was errors, add a message and redirect */
-        if ( $user->errors ) {
-            bp_core_add_message( __( 'There was an error activating your account, please try again.', 'buddypress' ), 'error' );
+        /* If there were errors, add a message and redirect */
+        if ( !empty( $user->errors ) ) {
+            bp_core_add_message( $user->get_error_message(), 'error' );
             bp_core_redirect( $bp->root_domain . '/' . BP_ACTIVATION_SLUG );
         }
@@ -435 +435 @@
         ) );
 
-        if ( is_wp_error( $user_id ) || !$user_id ) {
+        if ( empty( $user_id ) ) {
             $errors->add( 'registerfail', sprintf( __('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'buddypress' ), get_option( 'admin_email' ) ) );
             return $errors;
@@ -495 +495 @@
         $user = wpmu_activate_signup( $key );
 
-        /* If there was errors, add a message and redirect */
-        if ( $user->errors ) {
-            bp_core_add_message( __( 'There was an error activating your account, please try again.', 'buddypress' ), 'error' );
-            bp_core_redirect( $bp->root_domain . '/' . BP_ACTIVATION_SLUG );
+        /* If there were errors, add a message and redirect */
+        if ( !empty( $user->errors ) ) {
+            return $user;
         }