Changeset 25396 for trunk/src/wp-admin/setup-config.php

Timestamp:

09/12/2013 06:56:20 AM (10 years ago)

Author:

dd32

Message:

Fix wp_guess_url() to work in every scenario I could find, allows us to use it to determine the correct path to the WordPress Site URL before installation for install.php and setup-config.php redirects. Fixes #24480 Fixes #16884

File:

• trunk/src/wp-admin/setup-config.php (modified) (2 diffs)

trunk/src/wp-admin/setup-config.php

@@ -55 +55 @@
 // Turn register_globals off.
 wp_unregister_GLOBALS();
+
+// Standardize $_SERVER variables across setups.
+wp_fix_server_vars();
 
 require_once(ABSPATH . WPINC . '/compat.php');
@@ -199 +202 @@
         require_once( ABSPATH . WPINC . '/class-http.php' );
         require_once( ABSPATH . WPINC . '/http.php' );
-        wp_fix_server_vars();
         /**#@+
          * @ignore
          */
         function get_bloginfo() {
-            return ( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . str_replace( $_SERVER['PHP_SELF'], '/wp-admin/setup-config.php', '' ) );
+            return wp_guess_url();
         }
         /**#@-*/