Wordpress 3.0.2

[autoinstalls/wordpress.git] / wp-includes / functions.php

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 9606f01646f4fff6900329093e51ed86032a1920..8cd9ba79c95e8767c9880a2f3cf5e9c4795c7b06 100644 (file)
--- 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 {