Changeset 13427

Timestamp:

02/26/2010 06:21:47 AM (16 years ago)

Author:

nacin

Message:

Use is_ssl() in place of manual SERVERHTTPS == 'on' checks. fixes #11885

Location:

trunk

Files:

• wp-app.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

trunk/wp-app.php

@@ -225 +225 @@
 
                 $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
-                $this->app_base = get_bloginfo('url') . '/' . $this->script_name . '/';
-                if ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) {
-                        $this->app_base = preg_replace( '/^http:\/\//', 'https://', $this->app_base );
-                }
+                $this->app_base = home_url( $this->script_name . '/' );
 
                 $this->selectors = array(

trunk/wp-includes/canonical.php

@@ -43 +43 @@
         if ( !$requested_url ) {
                 // build the URL in the address bar
-                $requested_url  = ( !empty($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+                $requested_url  = is_ssl() ? 'https://' : 'http://';
                 $requested_url .= $_SERVER['HTTP_HOST'];
                 $requested_url .= $_SERVER['REQUEST_URI'];

trunk/wp-includes/functions.php

@@ -3338 +3338 @@
                 $url = WP_SITEURL;
         } else {
-                $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+                $schema = is_ssl() ? 'https://' : 'http://';
                 $url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
         }

trunk/wp-login.php

@@ -340 +340 @@
                 $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
 
-        $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+        $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']) );