Ticket #11885: 11885.diff

wp-includes/canonical.php

@@ -44 +44 @@
 
         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'];
         }