WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify logic in is_multisite(). 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-08 02:39:17 +00:00
parent c29313ab4d
commit ec7530d5bb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/load.php
View File

@ -568,10 +568,10 @@ 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 ) if ( defined( 'MULTISITE' ) )
return false; return MULTISITE;
if ( ( defined( 'MULTISITE' ) && MULTISITE ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) ) if ( defined( 'VHOST' ) || defined( 'SUNRISE' ) )
return true; return true;
return false; return false;