From 6d5a19ed170be628517e53ff76b31c137a1665f7 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 8 Apr 2010 02:39:17 +0000
Subject: [PATCH] Simplify logic in is_multisite().

git-svn-id: https://develop.svn.wordpress.org/trunk@14036 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/load.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/load.php b/wp-includes/load.php
index cd6c9f5f24..4a8a131024 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -568,10 +568,10 @@ function is_admin() {
  * @return bool True if multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) && ! MULTISITE )
-		return false;
+	if ( defined( 'MULTISITE' ) )
+		return MULTISITE;
 
-	if ( ( defined( 'MULTISITE' ) && MULTISITE ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+	if ( defined( 'VHOST' ) || defined( 'SUNRISE' ) )
 		return true;
 
 	return false;