Changeset 14298 for trunk/wp-includes/ms-functions.php

Timestamp:

04/29/2010 04:05:33 PM (15 years ago)

Author:

donncha

Message:

Display the original username on the signup form on error, fixes #13124

File:

• trunk/wp-includes/ms-functions.php (modified) (2 diffs)

trunk/wp-includes/ms-functions.php

@@ -457 +457 @@
     $errors = new WP_Error();
 
+    $orig_username = $user_name;
     $user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+    $maybe = array();
+    preg_match( '/[a-z0-9]+/', $user_name, $maybe );
+
+    if ( $user_name != $orig_username || $user_name != $maybe[0] ) {
+        $errors->add( 'user_name', __( "Only the lowercase letters a-z and numbers allowed" ) );
+        $user_name = $orig_username;
+    }
+
     $user_email = sanitize_email( $user_email );
 
     if ( empty( $user_name ) )
         $errors->add('user_name', __('Please enter a username'));
-
-    $maybe = array();
-    preg_match( '/[a-z0-9]+/', $user_name, $maybe );
-
-    if ( $user_name != $maybe[0] )
-        $errors->add('user_name', __('Only lowercase letters and numbers allowed'));
 
     $illegal_names = get_site_option( 'illegal_names' );
@@ -536 +539 @@
     }
 
-    $result = array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors);
+    $result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);
 
     return apply_filters('wpmu_validate_user_signup', $result);