sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@14000 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2010-04-05 00:00:13 +00:00
parent 2fc834c550
commit 1fa9e99992
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/load.php
View File

@ -568,6 +568,9 @@ function is_admin() {
* @return bool True if multisite is enabled, false otherwise. * @return bool True if multisite is enabled, false otherwise.
*/ */
function is_multisite() { function is_multisite() {
if ( defined( 'MULTISITE' ) && ! MULTISITE )
return false;
if ( ( defined( 'MULTISITE' ) && MULTISITE ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) ) if ( ( defined( 'MULTISITE' ) && MULTISITE ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
return true; return true;

2
wp-settings.php
View File

@ -85,6 +85,8 @@ require( ABSPATH . WPINC . '/pomo/mo.php' );
if ( is_multisite() ) { if ( is_multisite() ) {
require( ABSPATH . WPINC . '/ms-blogs.php' ); require( ABSPATH . WPINC . '/ms-blogs.php' );
require( ABSPATH . WPINC . '/ms-settings.php' ); require( ABSPATH . WPINC . '/ms-settings.php' );
} elseif ( ! defined( 'MULTISITE' ) ) {
define( 'MULTISITE', false );
} }
// Stop most of WordPress from being loaded if we just want the basics. // Stop most of WordPress from being loaded if we just want the basics.