WordPress 4.0

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

diff --git a/wp-load.php b/wp-load.php
index fb859533c36f0b6b4f9002d6d8c008e1d40200fc..9021ceb7475866cfbeca7b615b7375089b06df87 100644 (file)
--- a/wp-load.php
+++ b/wp-load.php
@@ -38,12 +38,7 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
        // A config file doesn't exist
 
        define( 'WPINC', 'wp-includes' );
-       define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
        require_once( ABSPATH . WPINC . '/load.php' );
-       require_once( ABSPATH . WPINC . '/version.php' );
-
-       wp_check_php_mysql_versions();
-       wp_load_translations_early();
 
        // Standardize $_SERVER variables across setups.
        wp_fix_server_vars();
@@ -52,6 +47,22 @@ if ( file_exists( ABSPATH . 'wp-config.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' );
+
+       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 .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';