X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/596d585e1dc1eb25bccd3781e37210a4e2504179..refs/tags/wordpress-3.7:/wp-load.php
diff --git a/wp-load.php b/wp-load.php
index 1372688f..fb859533 100644
--- a/wp-load.php
+++ b/wp-load.php
@@ -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,13 +45,18 @@ 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' );
+ $path = wp_guess_url() . '/wp-admin/setup-config.php';
+
// Die with an error message
$die = __( "There doesn't seem to be a wp-config.php
file. I need this before we can get started." ) . '
' . __( "Need more help? We got it." ) . '
'; $die .= '' . __( "You can create a wp-config.php
file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '
' . __( "Create a Configuration File" ) . ''; + $die .= '
' . __( "Create a Configuration File" ) . ''; wp_die( $die, __( 'WordPress › Error' ) ); }