From 4850c82d1c34aeb6ce8393dafea4589f038acbd4 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 10 Sep 2010 20:29:19 +0000
Subject: [PATCH] Fix UPLOADS constant. see #14840.

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

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index ac1176951..88f54b7f8 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2124,7 +2124,7 @@ function wp_upload_dir( $time = null ) {
 	$siteurl = get_option( 'siteurl' );
 	$upload_path = get_option( 'upload_path' );
 	$upload_path = trim($upload_path);
-	$main_override = defined( 'MULTISITE' ) && is_main_site();
+	$main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site();
 	if ( empty($upload_path) ) {
 		$dir = WP_CONTENT_DIR . '/uploads';
 	} else {