Changeset 25385

Timestamp:

09/12/2013 05:12:51 AM (13 years ago)

Author:

dd32

Message:

When the WordPress files are in a subdirectory, correctly redirect the user to the setup-config.php page from the parent directories index.php. Fixes #24480

File:

• trunk/src/wp-load.php (modified) (2 diffs)

trunk/src/wp-load.php

@@ -38 +38 @@
         // A config file doesn't exist
 
-        // Set a path for the link to the installer
-        if ( strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false )
-                $path = 'setup-config.php';
-        else
-                $path = 'wp-admin/setup-config.php';
-
         define( 'WPINC', 'wp-includes' );
         define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
@@ -52 +46 @@
         wp_load_translations_early();
 
+        // Standardize $_SERVER variables across setups.
+        wp_fix_server_vars();
+
         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' );
+        }
 
         // Die with an error message