Ticket #20759: 20759.2.diff

wp-includes/functions.php

@@ -2981 +2981 @@
  * @return string
  */
 function wp_guess_url() {
-        if ( defined('WP_SITEURL') && '' != WP_SITEURL )
+        if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
                 $url = WP_SITEURL;
-        else
-                $url = set_url_scheme( preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ) );
+        } else {
+                $schema = is_ssl() ? 'https://' : 'http://'; // set_url_scheme() is not defined yet
+                $url = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+        }
 
         return rtrim($url, '/');
 }