Changeset 25396 for trunk/src/wp-load.php

Timestamp:

09/12/2013 06:56:20 AM (12 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-load.php (modified) (1 diff)

trunk/src/wp-load.php

@@ -51 +51 @@
     require_once( ABSPATH . WPINC . '/functions.php' );
 
-    // Set a path for the link to the installer
-    if ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false ) {
-        $path = 'setup-config.php';
-    } elseif ( file_exists( dirname( $_SERVER['SCRIPT_FILENAME'] ) . '/wp-admin/setup-config.php' ) ) {
-        $path = 'wp-admin/setup-config.php';
-    } else {
-        // WordPress files are in a sub directory, and the user is hitting the index.php in the parent directory
-        $path = str_replace( dirname( $_SERVER['SCRIPT_FILENAME'] ) . '/', '', dirname( __FILE__ ) . '/wp-admin/setup-config.php' );
-    }
+    $path = wp_guess_url() . '/wp-admin/setup-config.php';
 
     // Die with an error message