HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add email and login dupe checking down into wp_insert_user(). Tidy up user-new.php. see #11644

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12778 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-01-20 21:58:13 +00:00
parent 0d6a380bd2
commit c679e65c9c
5 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/capabilities.php
View File

@@ -980,6 +980,12 @@ function map_meta_cap( $cap, $user_id ) {
else
$caps[] = $cap;
break;
case 'create_users':
if ( is_multisite() && !get_site_option( 'add_new_users' ) )
$caps[] = 'do_not_allow';
else
$caps[] = $cap;
break;
default:
// If no meta caps match, return the original cap.
$caps[] = $cap;

9
wp-includes/ms-functions.php
View File

@@ -1222,14 +1222,11 @@ function wpmu_activate_signup($key) {
function wpmu_create_user( $user_name, $password, $email) {
$user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) );
if ( username_exists($user_name) )
return false;
// Check if the email address has been used already.
if ( email_exists($email) )
return false;
$user_id = wp_create_user( $user_name, $password, $email );
if ( is_wp_error($user_id) )
return false;
$user = new WP_User($user_id);
// Newly created users have no roles or caps until they are added to a blog.

9
wp-includes/registration.php
View File

@@ -122,9 +122,11 @@ function wp_insert_user($userdata) {
//Remove any non-printable chars from the login string to see if we have ended up with an empty username
$user_login = trim($user_login);
if ( empty($user_login) ) {
if ( empty($user_login) )
return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
}
if ( !$update && username_exists( $user_login ) )
return new WP_Error('existing_user_login', __('This username is already registered.') );
if ( empty($user_nicename) )
$user_nicename = sanitize_title( $user_login );
@@ -138,6 +140,9 @@ function wp_insert_user($userdata) {
$user_email = '';
$user_email = apply_filters('pre_user_email', $user_email);
if ( !$update && email_exists($user_email) )
return new WP_Error('existing_user_email', __('This email address is already registered.') );
if ( empty($display_name) )
$display_name = $user_login;
$display_name = apply_filters('pre_user_display_name', $display_name);