Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow duplicate emails (generally empty) if WP_IMPORTING to restore 2.9 behavior. props blepoxp, yoavf. fixes #13130. see r12778. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-05-07 20:35:04 +00:00
parent 96a0afbc4a
commit 2bf6d14767
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/registration.php
View File

@ -140,7 +140,7 @@ function wp_insert_user($userdata) {
$user_email = '';
$user_email = apply_filters('pre_user_email', $user_email);
if ( !$update && email_exists($user_email) )
if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) )
return new WP_Error('existing_user_email', __('This email address is already registered.') );
if ( empty($display_name) )