Wordpress 3.1-scripts

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

diff --git a/wp-load.php b/wp-load.php
index 423edf54b4d1b81df0b4cf56ae9bf5176a163728..7cb70f6af7a94fdebd3fa6b5ed2452c0a91805ac 100644 (file)
--- a/wp-load.php
+++ b/wp-load.php
@@ -19,16 +19,19 @@
 /** Define ABSPATH as this files directory */
 define( 'ABSPATH', dirname(__FILE__) . '/' );
 
 /** Define ABSPATH as this files directory */
 define( 'ABSPATH', dirname(__FILE__) . '/' );
 

-error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE);
+if ( defined('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);
+else
+       error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);

 
 if ( file_exists( ABSPATH . 'wp-config.php') ) {
 
        /** The config file resides in ABSPATH */
        require_once( ABSPATH . 'wp-config.php' );
 
 
 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' ) ) {
+} elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-settings.php' ) ) {

 
 

-       /** The config file resides one level below ABSPATH */
+       /** The config file resides one level above ABSPATH but is not part of another install*/

        require_once( dirname(ABSPATH) . '/wp-config.php' );
 
 } else {
        require_once( dirname(ABSPATH) . '/wp-config.php' );
 
 } else {


@@ -36,15 +39,18 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
        // A config file doesn't exist
 
        // Set a path for the link to the installer
        // 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/';
+       if ( strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false )
+               $path = '';
+       else
+               $path = 'wp-admin/';

 
        // Die with an error message
 
        // Die with an error message

-       require_once( ABSPATH . '/wp-includes/classes.php' );
+       require_once( ABSPATH . '/wp-includes/class-wp-error.php' );

        require_once( ABSPATH . '/wp-includes/functions.php' );
        require_once( ABSPATH . '/wp-includes/plugin.php' );
        require_once( ABSPATH . '/wp-includes/functions.php' );
        require_once( ABSPATH . '/wp-includes/plugin.php' );

-       wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. 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>"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/"WordPress &rsaquo; Error"/*/WP_I18N_ERROR_TITLE*/);
+       $text_direction = /*WP_I18N_TEXT_DIRECTION*/"ltr"/*/WP_I18N_TEXT_DIRECTION*/;
+       wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. 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>"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/"WordPress &rsaquo; Error"/*/WP_I18N_ERROR_TITLE*/, array('text_direction' => $text_direction));

 
 }
 
 
 }
 

-?>
+?>
\ No newline at end of file