Ticket #4939: registration-error-messages-01.patch

bp-members/bp-members-functions.php

@@ -1101 +1101 @@
         bp_core_flush_illegal_names();
 
         $illegal_names = get_site_option( 'illegal_names' );
+        
+        if( in_array( $user_name, (array) $illegal_names ) )
+        $errors->add( 'user_name', __( 'That Username is a reserved name, please choose another.', 'buddypress' ) );
+        
+        if ( !validate_username( $user_name ) )
+                $errors->add( 'user_name', __( 'Please use only letters, numbers, ., -, *, and @ in usernames', 'buddypress' ) );
 
-        if ( !validate_username( $user_name ) || in_array( $user_name, (array) $illegal_names ) )
-                $errors->add( 'user_name', __( 'Only lowercase letters and numbers allowed', 'buddypress' ) );
-
         if( strlen( $user_name ) < 4 )
                 $errors->add( 'user_name',  __( 'Username must be at least 4 characters', 'buddypress' ) );