Changeset 21664 for trunk/wp-login.php

Timestamp:

08/30/2012 01:33:00 PM (12 years ago)

Author:

ryan

Message:

Use set_url_scheme(). Props johnbillion, MarcusPope. see #19037 #20759

File:

• trunk/wp-login.php (modified) (2 diffs)

trunk/wp-login.php

@@ -13 +13 @@
 
 // Redirect to https login if forced to use SSL
-if ( force_ssl_admin() && !is_ssl() ) {
+if ( force_ssl_admin() && ! is_ssl() ) {
     if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
-        wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
+        wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
         exit();
     } else {
-        wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+        wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
         exit();
     }
@@ -366 +366 @@
         $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
 
-    $schema = is_ssl() ? 'https://' : 'http://';
-    if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
-        update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
+    $url = dirname( set_url_scheme( 'http://' .  $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
+    if ( $url != get_option( 'siteurl' ) )
+        update_option( 'siteurl', $url );
 }