Changeset 8730

Timestamp:

08/25/2008 08:40:34 PM (18 years ago)

Author:

ryan

Message:

Do secure redirect only for admin destinations. see #7561

Location:

trunk

Files:

• wp-includes/pluggable.php (modified) (2 diffs)
• wp-login.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -694 +694 @@
 
         // If https is required and request is http, redirect
-        if ( $secure && !is_ssl() ) {
+        if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
                 if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
                         wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
@@ -706 +706 @@
         if ( $user_id = wp_validate_auth_cookie() ) {
                 // If the user wants ssl but the session is not ssl, redirect.
-                if ( !$secure && get_user_option('use_ssl', $user_id) ) {
+                if ( !$secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
                         if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
                                 wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

trunk/wp-login.php

@@ -424 +424 @@
                 $redirect_to = $_REQUEST['redirect_to'];
                 // Redirect to https if user wants ssl
-                if ( $secure_cookie )
+                if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') )
                         $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
         } else {