Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 

Built from https://develop.svn.wordpress.org/trunk@25385


git-svn-id: http://core.svn.wordpress.org/trunk@25324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2013-09-12 05:13:08 +00:00
parent 072b0f2128
commit 93f7757c24
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-load.php
View File

@ -37,12 +37,6 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
// 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' );
require_once( ABSPATH . WPINC . '/load.php' );
@ -51,8 +45,21 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
wp_check_php_mysql_versions();
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
$die = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';
$die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';