Changeset 8242 for branches/crazyhorse/wp-login.php

Timestamp:

07/02/2008 11:07:56 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/wp-login.php (modified) (5 diffs)

branches/crazyhorse/wp-login.php

@@ -13 +13 @@
 
 // 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']));
@@ -313 +313 @@
 ?>
 
-<form name="lostpasswordform" id="lostpasswordform" action="wp-login.php?action=lostpassword" method="post">
+<form name="lostpasswordform" id="lostpasswordform" action="<?php echo site_url('wp-login.php?action=lostpassword', 'login_post') ?>" method="post">
     <p>
         <label><?php _e('Username or E-mail:') ?><br />
@@ -377 +377 @@
 ?>
 
-<form name="registerform" id="registerform" action="wp-login.php?action=register" method="post">
+<form name="registerform" id="registerform" action="<?php echo site_url('wp-login.php?action=register', 'login_post') ?>" method="post">
     <p>
         <label><?php _e('Username') ?><br />
@@ -410 +410 @@
         $redirect_to = $_REQUEST['redirect_to'];
     else
-        $redirect_to = 'wp-admin/';
-
-    if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) )
+        $redirect_to = admin_url();
+
+    if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) )
         $secure_cookie = false;
     else
@@ -446 +446 @@
 ?>
 
-<form name="loginform" id="loginform" action="wp-login.php" method="post">
+<form name="loginform" id="loginform" action="<?php echo site_url('wp-login.php', 'login_post') ?>" method="post">
 <?php if ( !isset($_GET['checkemail']) || !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
     <p>