Ticket #2784: 2784.diff

bp-core-signup.php

@@ -219 +219 @@
 
                 /* 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_add_message( $user->get_error_message(), 'error' );
                         bp_core_redirect( $bp->root_domain . '/' . BP_ACTIVATION_SLUG );
                 }
 
@@ -348 +391 @@
                         'user_email' => $user_email
                 ) );
 
-                if ( is_wp_error( $user_id ) || !$user_id ) {
+                if ( !$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;
                 }
@@ -408 +451 @@
                 $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 ( $user->errors )
+                        return $user;
 
                 $user_id = $user['user_id'];