diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-06 10:41:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-06 10:41:20 +0000 |
| commit | 779f0f4411b6467808ff053780c7c96ed0f9a571 (patch) | |
| tree | fe52143d0597da054fc189e0c2058320d114cfc7 /wp-login.php | |
| parent | 78b9569980333f344366151f2dfc9e5b6412e175 (diff) | |
| download | wordpress-mu-779f0f4411b6467808ff053780c7c96ed0f9a571.tar.gz wordpress-mu-779f0f4411b6467808ff053780c7c96ed0f9a571.tar.xz wordpress-mu-779f0f4411b6467808ff053780c7c96ed0f9a571.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@638 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-login.php')
| -rw-r--r-- | wp-login.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-login.php b/wp-login.php index b169ee5..8ee6e8a 100644 --- a/wp-login.php +++ b/wp-login.php @@ -98,7 +98,7 @@ case 'retrievepassword': $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? <a href="%s">Try again</a>.'), '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? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword')); do_action('retreive_password', $user_login); // Misspelled and deprecated. do_action('retrieve_password', $user_login); @@ -132,10 +132,10 @@ case 'rp' : // 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'); |