Changeset 19852

Timestamp:

02/07/2012 05:44:29 PM (13 years ago)

Author:

nacin

Message:

Simplify matching code. see #19670.

File:

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

trunk/wp-includes/ms-functions.php

@@ -437 +437 @@
     $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 || ( !empty( $maybe ) && $user_name != $maybe[0] ) ) {
+
+    if ( $user_name != $orig_username || preg_match( '/[^a-z0-9]/', $user_name ) ) {
         $errors->add( 'user_name', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
         $user_name = $orig_username;