Changeset 21797

Timestamp:

09/10/2012 07:37:08 PM (12 years ago)

Author:

ryan

Message:

Don't use set_url_scheme() in wp_guess_url(). wp_guess_url() is used during install before set_url_scheme() is loaded. Props SergeyBiryukov. fixes #20759

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -2982 +2982 @@
  */
 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, '/');