Ticket #27317: 27317.diff

src/wp-includes/user.php

@@ -2136 +2136 @@
                 $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
         }
 
+        /** This filter is documented in wp-includes/user.php */
+        $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+
+        if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {
+                $errors->add( 'illegal_user_login', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
+        }
+
         /**
          * Fires when submitting registration form data, before the user is created.
          *

tests/phpunit/tests/user.php

@@ -612 +612 @@
          * @dataProvider _illegal_user_logins_data
          */
         function test_illegal_user_logins_single( $user_login ) {
+                $user_email = 'testuser@example.com';
+
                 $user_data = array(
                         'user_login' => $user_login,
-                        'user_email' => 'testuser@example.com',
+                        'user_email' => $user_email,
                         'user_pass'  => wp_generate_password(),
                 );
 
                 add_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
 
+                // Test wp_insert_user()
                 $response = wp_insert_user( $user_data );
                 $this->assertInstanceOf( 'WP_Error', $response );
                 $this->assertEquals( 'illegal_user_login', $response->get_error_code() );
 
+                // Test register_new_user()
+                $response = register_new_user( $user_login, $user_email );
+                $this->assertInstanceOf( 'WP_Error', $response );
+                $this->assertEquals( 'illegal_user_login', $response->get_error_code() );
+
                 remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
 
+                // Test wp_insert_user() without illegal login filter
                 $user_id = wp_insert_user( $user_data );
                 $user = get_user_by( 'id', $user_id );
                 $this->assertInstanceOf( 'WP_User', $user );
+                wp_delete_user( $user_id );
+
+                // Test register_new_user() without illegal login filter
+                $user_id = register_new_user( $user_login, $user_email );
+                $user = get_user_by( 'id', $user_id );
+                $this->assertInstanceOf( 'WP_User', $user );
         }
 
         /**