Changeset 14000

Timestamp:

04/05/2010 12:00:13 AM (15 years ago)

Author:

nacin

Message:

Prevent half-baked loading of MS that would happen when constants are added into wp-config below the wp-settings include. Now it would error on the redefinition of the MULTISITE constant, instead of vague errors, and prevent any MS from loading. see #12848

Location:

trunk

Files:

• wp-includes/load.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/load.php

@@ -569 +569 @@
  */
 function is_multisite() {
+    if ( defined( 'MULTISITE' ) && ! MULTISITE )
+        return false;
+
     if ( ( defined( 'MULTISITE' ) && MULTISITE ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
         return true;

trunk/wp-settings.php

@@ -86 +86 @@
     require( ABSPATH . WPINC . '/ms-blogs.php' );
     require( ABSPATH . WPINC . '/ms-settings.php' );
+} elseif ( ! defined( 'MULTISITE' ) ) {
+    define( 'MULTISITE', false );
 }