diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-02 13:44:49 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-02 13:44:49 +0000 |
commit | 6d572cbe19ffedb5b92d8528798c5683154bb185 (patch) | |
tree | 4cc943e8f399addf1a10c03386342110bcc9d584 /wp-login.php | |
parent | 034c1b3b665fa28816dfc6157d610c6d25fd54fe (diff) | |
download | wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.tar.gz wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.tar.xz wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.zip |
WP Merge to rev 8216
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1344 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-login.php')
-rw-r--r-- | wp-login.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/wp-login.php b/wp-login.php index fb05c54..5bff3e5 100644 --- a/wp-login.php +++ b/wp-login.php @@ -12,7 +12,7 @@ require( dirname(__FILE__) . '/wp-load.php' ); // Redirect to https login if forced to use SSL -if ( (force_ssl_admin() || force_ssl_login()) && !is_ssl() ) { +if ( force_ssl_admin() && !is_ssl() ) { if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) { wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI'])); exit(); @@ -185,17 +185,11 @@ function reset_password($key) { wp_set_password($new_pass, $user->ID); $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n"; $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n"; - $message .= get_option('siteurl') . "/wp-login.php\r\n"; + $message .= site_url('wp-login.php', 'login') . "\r\n"; if ( !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), $current_site->site_name), $message) ) die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>'); - // send a copy of password change notification to the admin - // but check to see if it's the admin whose password we're changing, and skip this - if ( $user->user_email != get_option('admin_email') ) { - $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; - } - return true; } @@ -411,9 +405,9 @@ default: if ( isset( $_REQUEST['redirect_to'] ) ) $redirect_to = $_REQUEST['redirect_to']; else - $redirect_to = 'wp-admin/'; + $redirect_to = admin_url(); - if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) ) + if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) ) $secure_cookie = false; else $secure_cookie = ''; |