From ec7530d5bb47b94f081592c485aafd98e48e385e Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 8 Apr 2010 02:39:17 +0000
Subject: [PATCH] Simplify logic in is_multisite().

git-svn-id: http://svn.automattic.com/wordpress/trunk@14036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 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 cd6c9f5f2..4a8a13102 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;