WordPress 3.9.2-scripts

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

diff --git a/wp-load.php b/wp-load.php
index b9ae7e8a0891b06e0ab38158dd2e471b753deb29..fb859533c36f0b6b4f9002d6d8c008e1d40200fc 100644 (file)
--- a/wp-load.php
+++ b/wp-load.php
@@ -18,7 +18,7 @@
  * @package WordPress
  */
 
-/** Define ABSPATH as this files directory */
+/** Define ABSPATH as this file's directory */
 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 );
@@ -30,31 +30,33 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
 
 } elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-settings.php' ) ) {
 
-       /** The config file resides one level above ABSPATH but is not part of another install*/
+       /** The config file resides one level above ABSPATH but is not part of another install */
        require_once( dirname(ABSPATH) . '/wp-config.php' );
 
 } else {
 
        // A config file doesn't exist
 
-       // Set a path for the link to the installer
-       if ( strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false )
-               $path = '';
-       else
-               $path = 'wp-admin/';
-
-       require_once( ABSPATH . '/wp-includes/load.php' );
-       require_once( ABSPATH . '/wp-includes/version.php' );
+       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();
+
+       require_once( ABSPATH . WPINC . '/functions.php' );
+
+       $path = wp_guess_url() . '/wp-admin/setup-config.php';
 
        // Die with an error message
-       require_once( ABSPATH . '/wp-includes/class-wp-error.php' );
-       require_once( ABSPATH . '/wp-includes/functions.php' );
-       require_once( ABSPATH . '/wp-includes/plugin.php' );
-       $text_direction = /*WP_I18N_TEXT_DIRECTION*/'ltr'/*/WP_I18N_TEXT_DIRECTION*/;
-       wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"<p>There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started.</p> <p>Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>.</p> <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><p><a href='%ssetup-config.php' class='button'>Create a Configuration File</a></p>"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/'WordPress &rsaquo; Error'/*/WP_I18N_ERROR_TITLE*/, array('text_direction' => $text_direction));
+       $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>' . __( "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 button-large">' . __( "Create a Configuration File" ) . '</a>';
 
+       wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
 }
-
-?>
\ No newline at end of file