Subject: [PATCH] 57967
---
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
|
a
|
b
|
|
| 2129 | 2129 | } |
| 2130 | 2130 | |
| 2131 | 2131 | // Username must not match an existing user email. |
| 2132 | | if ( email_exists( $user_login ) ) { |
| | 2132 | $existing_user_id = email_exists( $user_login ); |
| | 2133 | if ( $existing_user_id && ( ! $update || ( $user_id && $existing_user_id !== $user_id ) ) ) { |
| 2133 | 2134 | return new WP_Error( 'existing_user_email_as_login', __( 'Sorry, that username is not available.' ) ); |
| 2134 | 2135 | } |
| 2135 | 2136 | |