WordPress.org

Make WordPress Core

Changeset 25385


Ignore:
Timestamp:
09/12/2013 05:12:51 AM (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-load.php

    r25001 r25385  
    3838    // A config file doesn't exist
    3939
    40     // Set a path for the link to the installer
    41     if ( strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false )
    42         $path = 'setup-config.php';
    43     else
    44         $path = 'wp-admin/setup-config.php';
    45 
    4640    define( 'WPINC', 'wp-includes' );
    4741    define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
     
    5246    wp_load_translations_early();
    5347
     48    // Standardize $_SERVER variables across setups.
     49    wp_fix_server_vars();
     50
    5451    require_once( ABSPATH . WPINC . '/functions.php' );
     52
     53    // Set a path for the link to the installer
     54    if ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false ) {
     55        $path = 'setup-config.php';
     56    } elseif ( file_exists( dirname( $_SERVER['SCRIPT_FILENAME'] ) . '/wp-admin/setup-config.php' ) ) {
     57        $path = 'wp-admin/setup-config.php';
     58    } else {
     59        // WordPress files are in a sub directory, and the user is hitting the index.php in the parent directory
     60        $path = str_replace( dirname( $_SERVER['SCRIPT_FILENAME'] ) . '/', '', dirname( __FILE__ ) . '/wp-admin/setup-config.php' );
     61    }
    5562
    5663    // Die with an error message
Note: See TracChangeset for help on using the changeset viewer.