From 1f04bb1bda7ce8489a67505fc7d6a487e5c4cae3 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 26 Oct 2010 03:45:13 +0000
Subject: [PATCH] Also look for SUBDOMAIN_INSTALL in is_multisite(). props
 wpmuguru, fixes #14536 for trunk.

git-svn-id: http://svn.automattic.com/wordpress/trunk@15968 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/load.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/load.php b/wp-includes/load.php
index 37fa7d084..5489f4a62 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -647,7 +647,7 @@ function is_multisite() {
 	if ( defined( 'MULTISITE' ) )
 		return MULTISITE;
 
-	if ( defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
 		return true;
 
 	return false;