Index: wp-login.php
===================================================================
--- wp-login.php (revision 3984)
+++ wp-login.php (working copy)
@@ -98,7 +98,7 @@
$user_email = $user_data->user_email;
if (!$user_email || $user_email != $_POST['email'])
- die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? Try again.'), 'wp-login.php?action=lostpassword'));
+ wp_die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? Try again.'), 'wp-login.php?action=lostpassword'));
do_action('retreive_password', $user_login); // Misspelled and deprecated.
do_action('retrieve_password', $user_login);
@@ -118,11 +118,11 @@
if ($m == false) {
echo '' . __('The e-mail could not be sent.') . "
\n";
echo __('Possible reason: your host may have disabled the mail() function...') . "
";
- die();
+ wp_die();
} else {
echo '' . sprintf(__("The e-mail was sent successfully to %s's e-mail address."), $user_login) . '
';
echo "" . __('Click here to login!') . '
';
- die();
+ wp_die();
}
break;
@@ -132,10 +132,10 @@
// Generate something random for a password... md5'ing current time with a rand salt
$key = preg_replace('/a-z0-9/i', '', $_GET['key']);
if ( empty($key) )
- die( __('Sorry, that key does not appear to be valid.') );
+ wp_die( __('Sorry, that key does not appear to be valid.') );
$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'");
if ( !$user )
- die( __('Sorry, that key does not appear to be valid.') );
+ wp_die( __('Sorry, that key does not appear to be valid.') );
do_action('password_reset');
@@ -152,14 +152,14 @@
if ($m == false) {
echo '' . __('The e-mail could not be sent.') . "
\n";
echo __('Possible reason: your host may have disabled the mail() function...') . '
';
- die();
+ wp_die();
} else {
echo '' . sprintf(__('Your new password is in the mail.'), $user_login) . '
';
echo "" . __('Click here to login!') . '
';
// send a copy of password change notification to the admin
$message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), $message);
- die();
+ wp_die();
}
break;
Index: wp-blog-header.php
===================================================================
--- wp-blog-header.php (revision 3984)
+++ wp-blog-header.php (working copy)
@@ -18,4 +18,4 @@
endif;
-?>
\ No newline at end of file
+?>
Index: wp-includes/wp-db.php
===================================================================
--- wp-includes/wp-db.php (revision 3984)
+++ wp-includes/wp-db.php (working copy)
@@ -355,7 +355,7 @@
HEAD;
echo $message;
echo "