Index: wp-login.php =================================================================== --- wp-login.php (revision 2434) +++ wp-login.php (working copy) @@ -66,7 +66,7 @@
-: +:
: @@ -101,8 +101,8 @@ $key = substr( md5( uniqid( microtime() ) ), 0, 50); // now insert the new pass md5'd into the db $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'"); - $message .= __("Someone has asked to reset a password for the login this site\n\n " . get_option('siteurl') ) . "\n\n"; - $message .= __('Login') . ": $user_login\r\n\r\n"; + $message .= __("Someone has asked to reset a password for the username this site\n\n " . get_option('siteurl') ) . "\n\n"; + $message .= __('Username') . ": $user_login\r\n\r\n"; $message .= __("To reset your password visit the following address, otherwise just ignore this email and nothing will happen.\n\n"); $message .= get_settings('siteurl') . "/wp-login.php?action=resetpass&key=$key"; @@ -132,7 +132,7 @@ $new_pass = substr( md5( uniqid( microtime() ) ), 0, 7); $wpdb->query("UPDATE $wpdb->users SET user_pass = MD5('$new_pass'), user_activation_key = '' WHERE user_login = '$user->user_login'"); - $message = __('Login') . ": $user->user_login\r\n"; + $message = __('Username') . ": $user->user_login\r\n"; $message .= __('Password') . ": $new_pass\r\n"; $message .= get_settings('siteurl') . '/wp-login.php'; @@ -222,7 +222,7 @@ ?>
:
@@ -244,4 +244,4 @@ break; } // end action switch -?> \ No newline at end of file +?> Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (revision 2434) +++ wp-includes/functions.php (working copy) @@ -1678,7 +1678,7 @@ $login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'"); if (!$login) { - $error = __('Error: Wrong login.'); + $error = __('Error: Wrong username.'); return false; } else { // If the password is already_md5, it has been double hashed. Index: wp-register.php =================================================================== --- wp-register.php (revision 2434) +++ wp-register.php (working copy) @@ -28,9 +28,9 @@ $user_login = $_POST['user_login']; $user_email = $_POST['user_email']; - /* checking login has been typed */ + /* checking that username has been typed */ if ($user_login == '') { - die (__('ERROR: Please enter a login.')); + die (__('ERROR: Please enter a username.')); } /* checking e-mail address */ @@ -40,10 +40,10 @@ die (__('ERROR: The email address isn’t correct.')); } - /* checking the login isn't already used by another user */ + /* checking the username isn't already used by another user */ $result = $wpdb->get_results("SELECT user_login FROM $wpdb->users WHERE user_login = '$user_login'"); if (count($result) >= 1) { - die (__('ERROR: This login is already registered, please choose another one.')); + die (__('ERROR: This username is already registered, please choose another one.')); } $user_ip = $_SERVER['REMOTE_ADDR'] ; @@ -73,13 +73,13 @@ $stars .= '*'; } - $message = __('Login') . ": $user_login\r\n"; + $message = __('Username') . ": $user_login\r\n"; $message .= __('Password') . ": $password\r\n"; $message .= get_settings('siteurl') . '/wp-login.php'; - wp_mail($user_email, sprintf(__("[%s] Your login information"), get_settings('blogname')), $message); + wp_mail($user_email, sprintf(__("[%s] Your username and password"), get_settings('blogname')), $message); - $message = sprintf(__("New user registration on your blog %1\$s:\n\nLogin: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email); + $message = sprintf(__("New user registration on your blog %1\$s:\n\nUsername: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email); @wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message); @@ -100,7 +100,7 @@
+
emailed to you
»
-
A password will be emailed to you.
log in with the login "admin" and password "%2$s".'), '../wp-login.php', $random_password); ?>
admin
%2$s
log in with the username "admin" and password "%2$s".'), '../wp-login.php', $random_password); ?>
Note that password carefully! It is a random password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?>