Ticket #11881: 11881.fixes-setup-config-only.diff

Index: wp-settings.php
===================================================================
--- wp-settings.php     (revision 12723)
+++ wp-settings.php     (working copy)
@@ -9,20 +9,14 @@
  * @package WordPress
  */
 
-
 /**
- * Whether Multisite support is enabled
+ * Stores the location of the WordPress directory of functions, classes, and core content.
  *
- * @since 3.0
- *
- * @return bool True if multisite is enabled, false otherwise.
+ * @since 1.0.0
  */
-function is_multisite() {
-       if ( ( defined('MULTISITE') && MULTISITE ) || defined('VHOST') || defined('SUNRISE') )
-               return true;
+define('WPINC', 'wp-includes');
 
-       return false;
-}
+require( ABSPATH . WPINC . '/load.php');
 
 if ( !defined('WP_MEMORY_LIMIT') ) {
         if( is_multisite() ) {
@@ -255,13 +249,6 @@
 if ( !defined('MEDIA_TRASH') )
        define('MEDIA_TRASH', false);
 
-/**
- * Stores the location of the WordPress directory of functions, classes, and core content.
- *
- * @since 1.0.0
- */
-define('WPINC', 'wp-includes');
-
 if ( !defined('WP_LANG_DIR') ) {
        /**
         * Stores the location of the language directory. First looks for language folder in WP_CONTENT_DIR
Index: wp-includes/load.php
===================================================================
--- wp-includes/load.php        (revision 0)
+++ wp-includes/load.php        (revision 0)
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Initialization functions.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Whether Multisite support is enabled
+ *
+ * @since 3.0
+ *
+ * @return bool True if multisite is enabled, false otherwise.
+ */
+function is_multisite() {
+       if ( ( defined('MULTISITE') && MULTISITE ) || defined('VHOST') || defined('SUNRISE') )
+               return true;
+
+       return false;
+}
+
+?>
\ No newline at end of file
Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php   (revision 12723)
+++ wp-admin/setup-config.php   (working copy)
@@ -31,8 +31,10 @@
 define('ABSPATH', dirname(dirname(__FILE__)).'/');
 define('WPINC', 'wp-includes');
 define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
+define('WP_DEBUG', false);
 /**#@-*/
 
+require_once(ABSPATH . WPINC . '/load.php');
 require_once(ABSPATH . WPINC . '/compat.php');
 require_once(ABSPATH . WPINC . '/functions.php');
 require_once(ABSPATH . WPINC . '/classes.php');