Changes in trunk/wp-load.php [16099:18375]

File:

• trunk/wp-load.php (modified) (3 diffs)

trunk/wp-load.php

@@ -14 +14 @@
  * untouched.
  *
+ * @internal This file must be parsable by PHP4.
+ *
  * @package WordPress
  */
@@ -20 +22 @@
 define( 'ABSPATH', dirname(__FILE__) . '/' );
 
-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);
+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 ( file_exists( ABSPATH . 'wp-config.php') ) {
@@ -45 +44 @@
         $path = 'wp-admin/';
 
+    require_once( ABSPATH . '/wp-includes/load.php' );
+    require_once( ABSPATH . '/wp-includes/version.php' );
+    define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
+    wp_check_php_mysql_versions();
+
     // 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*/"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));
+    $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));
 
 }