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
tierra · Oct 27, 2010 · 5935097 · 5935097
1 parent 1322e56
commit 5935097
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 {