Changeset 14428 for trunk/wp-includes/formatting.php

Timestamp:

05/03/2010 11:46:42 PM (16 years ago)

Author:

ryan

Message:

Fix user validation feedback. Props sivel. fixes #13162

File:

• trunk/wp-includes/formatting.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -736 +736 @@
 function sanitize_user( $username, $strict = false ) {
     $raw_username = $username;
-    $username = wp_strip_all_tags($username);
+    $username = wp_strip_all_tags( $username );
+    $username = remove_accents( $username );
     // Kill octets
-    $username = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '', $username);
-    $username = preg_replace('/&.+?;/', '', $username); // Kill entities
+    $username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );
+    $username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
 
     // If strict, reduce to ASCII for max portability.
     if ( $strict )
-        $username = preg_replace('|[^a-z0-9 _.\-@]|i', '', $username);
+        $username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
 
     // Consolidate contiguous whitespace
-    $username = preg_replace('|\s+|', ' ', $username);
-
-    return apply_filters('sanitize_user', $username, $raw_username, $strict);
+    $username = preg_replace( '|\s+|', ' ', $username );
+
+    return apply_filters( 'sanitize_user', $username, $raw_username, $strict );
 }