WordPress 4.3.1

[autoinstalls/wordpress.git] / wp-load.php

diff --git a/wp-load.php b/wp-load.php
index 600805a2d14019a5041f63db4765273e02b6726e..983298bb68da06c15a008803066f32aa1d59886d 100644 (file)
--- a/wp-load.php
+++ b/wp-load.php
@@ -23,6 +23,14 @@ define( 'ABSPATH', dirname(__FILE__) . '/' );
 
 error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 
 
 error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 

+/*
+ * If wp-config.php exists in the WordPress root, or if it exists in the root and wp-settings.php
+ * doesn't, load wp-config.php. The secondary check for wp-settings.php has the added benefit
+ * of avoiding cases where the current directory is a nested installation, e.g. / is WordPress(a)
+ * and /blog/ is WordPress(b).
+ *
+ * If neither set of conditions is true, initiate loading the setup process.
+ */

 if ( file_exists( ABSPATH . 'wp-config.php') ) {
 
        /** The config file resides in ABSPATH */
 if ( file_exists( ABSPATH . 'wp-config.php') ) {
 
        /** The config file resides in ABSPATH */


@@ -37,25 +45,37 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
 
        // A config file doesn't exist
 
 
        // 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( 'WPINC', 'wp-includes' );

-       define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );

        require_once( ABSPATH . WPINC . '/load.php' );
        require_once( ABSPATH . WPINC . '/load.php' );

+
+       // Standardize $_SERVER variables across setups.
+       wp_fix_server_vars();
+
+       require_once( ABSPATH . WPINC . '/functions.php' );
+
+       $path = wp_guess_url() . '/wp-admin/setup-config.php';
+
+       /*
+        * We're going to redirect to setup-config.php. While this shouldn't result
+        * in an infinite loop, that's a silly thing to assume, don't you think? If
+        * we're traveling in circles, our last-ditch effort is "Need more help?"
+        */
+       if ( false === strpos( $_SERVER['REQUEST_URI'], 'setup-config' ) ) {
+               header( 'Location: ' . $path );
+               exit;
+       }
+
+       define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );

        require_once( ABSPATH . WPINC . '/version.php' );
 
        require_once( ABSPATH . WPINC . '/version.php' );
 

-       wp_load_translations_early();

        wp_check_php_mysql_versions();
        wp_check_php_mysql_versions();

+       wp_load_translations_early();

 
        // 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 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>';
+       $die .= '<p>' . __( "Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';

        $die .= '<p>' . __( "You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>';
        $die .= '<p>' . __( "You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>';

-       $die .= '<p><a href="' . $path . '" class="button">' . __( "Create a Configuration File" ) . '</a>';
+       $die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';

 
        wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
 }
 
        wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
 }