From 59350976e6bd06fe579b9028f75a0a1d46e27c72 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Wed, 27 Oct 2010 01:58:17 +0000
Subject: [PATCH] Fix UPLOADS constant. fixes #14840 for the 3.0 branch.

git-svn-id: https://develop.svn.wordpress.org/branches/3.0@15995 602fd350-edb4-49c9-b593-d223f7449a82
---
 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 9606f0164..8cd9ba79c 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2125,7 +2125,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 {