Wordpress 3.1

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

diff --git a/wp-load.php b/wp-load.php
index aee3b39f59f16ba0ac47330234562b43307de61a..7cb70f6af7a94fdebd3fa6b5ed2452c0a91805ac 100644 (file)
--- a/wp-load.php
+++ b/wp-load.php
@@ -20,9 +20,9 @@
 define( 'ABSPATH', dirname(__FILE__) . '/' );
 
 if ( defined('E_RECOVERABLE_ERROR') )
-       error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | 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_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
+       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') ) {
 
@@ -39,11 +39,13 @@ 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 = '';
-       else $path = 'wp-admin/';
+       if ( strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false )
+               $path = '';
+       else
+               $path = 'wp-admin/';
 
        // 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' );
        $text_direction = /*WP_I18N_TEXT_DIRECTION*/"ltr"/*/WP_I18N_TEXT_DIRECTION*/;
@@ -51,4 +53,4 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
 
 }
 
-?>
+?>
\ No newline at end of file