Changeset 2752 for branches/1.2/bp-core/bp-core-wpabstraction.php

Timestamp:

02/20/2010 12:34:32 AM (15 years ago)

Author:

apeatling

Message:

Run username through validate_username() check on signup. Fixes #1992

File:

• branches/1.2/bp-core/bp-core-wpabstraction.php (modified) (3 diffs)

branches/1.2/bp-core/bp-core-wpabstraction.php

@@ -97 +97 @@
         $errors = new WP_Error();
 
-        $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) );
         $user_email = sanitize_email( $user_email );
 
@@ -106 +105 @@
         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" );
         if( is_array( $illegal_names ) == false ) {
@@ -115 +110 @@
             add_site_option( "illegal_names", $illegal_names );
         }
-        if( in_array( $user_name, $illegal_names ) == true ) {
-            $errors->add('user_name',  __("That username is not allowed"));
+
+        if ( !validate_username( $user_name ) || in_array( $user_name, $illegal_names ) == true || $user_name != $maybe[0] ) {
+            $errors->add('user_name', __("Only lowercase letters and numbers allowed"));
         }