WordPress.org

Make WordPress Core

Changeset 14000


Ignore:
Timestamp:
04/05/10 00:00:13 (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/load.php

    r13830 r14000  
    569569 */ 
    570570function is_multisite() { 
     571    if ( defined( 'MULTISITE' ) && ! MULTISITE ) 
     572        return false; 
     573 
    571574    if ( ( defined( 'MULTISITE' ) && MULTISITE ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) ) 
    572575        return true; 
  • trunk/wp-settings.php

    r13831 r14000  
    8686    require( ABSPATH . WPINC . '/ms-blogs.php' ); 
    8787    require( ABSPATH . WPINC . '/ms-settings.php' ); 
     88} elseif ( ! defined( 'MULTISITE' ) ) { 
     89    define( 'MULTISITE', false ); 
    8890} 
    8991 
Note: See TracChangeset for help on using the changeset viewer.