Changeset 35142 for trunk/src/wp-includes/ms-functions.php

Timestamp:

10/13/2015 05:32:17 PM (9 years ago)

Author:

DrewAPicture

Message:

Multisite: Improve two error strings specifying allowed characters in usernames and site names.

Also removes two error strings that were likely never being triggered anyway due to the stricter character matching higher up.

Props atomicjack, bjornjohansen, DrewAPicture.
Fixes #33336.

File:

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

trunk/src/wp-includes/ms-functions.php

@@ -414 +414 @@
 
     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.' ) );
+        $errors->add( 'user_name', __( 'Usernames can only contain lowercase letters (a-z) and numbers.' ) );
         $user_name = $orig_username;
     }
@@ -440 +440 @@
         $errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
     }
-
-    if ( strpos( $user_name, '_' ) !== false )
-        $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character “_”!' ) );
 
     // all numeric?
@@ -562 +559 @@
         $errors->add('blogname', __( 'Please enter a site name.' ) );
 
-    if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
-        $errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
+    if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
+        $errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
+    }
 
     if ( in_array( $blogname, $illegal_names ) )
@@ -570 +568 @@
     if ( strlen( $blogname ) < 4 && !is_super_admin() )
         $errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
-
-    if ( strpos( $blogname, '_' ) !== false )
-        $errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) );
 
     // do not allow users to create a blog that conflicts with a page on the main blog.