From ecb75a16be01d90ca03dcb222080e116345cf421 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Sat, 10 Oct 2015 01:41:43 +0000 Subject: [PATCH] MS: Show an error if a new site slug conflicts with an existing username. Props utkarshpatel, dipesh.kakadiya. Fixes #33804. git-svn-id: https://develop.svn.wordpress.org/trunk@34996 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/network/site-new.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php index 238fd4d553..dac11614a4 100644 --- a/src/wp-admin/network/site-new.php +++ b/src/wp-admin/network/site-new.php @@ -90,6 +90,10 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { $password = 'N/A'; $user_id = email_exists($email); if ( !$user_id ) { // Create a new user with a random password + $user_id = username_exists( $domain ); + if ( $user_id ) { + wp_die( __( 'The domain or path entered conflicts with an existing username.' ) ); + } $password = wp_generate_password( 12, false ); $user_id = wpmu_create_user( $domain, $password, $email ); if ( false === $user_id ) {