WordPress 4.6.1-scripts

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

diff --git a/wp-load.php b/wp-load.php
index 9021ceb7475866cfbeca7b615b7375089b06df87..76dda74b763291416cdb409f3ee6fc83cdfc0d20 100644 (file)
--- a/wp-load.php
+++ b/wp-load.php
@@ -19,19 +19,29 @@
  */
 
 /** Define ABSPATH as this file's directory */
-define( 'ABSPATH', dirname(__FILE__) . '/' );
+if ( ! defined( 'ABSPATH' ) ) {
+       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 );
 
+/*
+ * 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 */
        require_once( ABSPATH . 'wp-config.php' );
 
-} elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-settings.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 */
-       require_once( dirname(ABSPATH) . '/wp-config.php' );
+       require_once( dirname( ABSPATH ) . '/wp-config.php' );
 
 } else {
 
@@ -64,9 +74,21 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
        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>';
-       $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  = sprintf(
+               /* translators: %s: wp-config.php */
+               __( "There doesn't seem to be a %s file. I need this before we can get started." ),
+               '<code>wp-config.php</code>'
+       ) . '</p>';
+       $die .= '<p>' . sprintf(
+               /* translators: %s: Codex URL */
+               __( "Need more help? <a href='%s'>We got it</a>." ),
+               __( 'https://codex.wordpress.org/Editing_wp-config.php' )
+       ) . '</p>';
+       $die .= '<p>' . sprintf(
+               /* translators: %s: wp-config.php */
+               __( "You can create a %s file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ),
+               '<code>wp-config.php</code>'
+       ) . '</p>';
        $die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';
 
        wp_die( $die, __( 'WordPress &rsaquo; Error' ) );