From 8c9d21d3c535ed1a733aafb205a8156961e62ece Mon Sep 17 00:00:00 2001
From: wpmuguru <wpmuguru@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 9 Mar 2010 18:19:28 +0000
Subject: [PATCH] Dont define BLOGUPLOADDIR if UPLOADS is defined, see #12558

git-svn-id: http://svn.automattic.com/wordpress/trunk@13632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-default-constants.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index 2447d81d4..931e94e99 100644
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -15,16 +15,17 @@ function ms_upload_constants(  ) {
 	global $wpdb;
 
 	/** @since 3.0.0 */
+	// Base uploads dir relative to ABSPATH
 	if ( !defined( 'UPLOADBLOGSDIR' ) )
 		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
 
 	/** @since 3.0.0 */
-	if ( !defined( 'UPLOADS' ) )
+	if ( !defined( 'UPLOADS' ) ) {
+		// Uploads dir relative to ABSPATH
 		define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
-
-	/** @since 3.0.0 */
-	if ( !defined( 'BLOGUPLOADDIR' ) )
-		define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR )
+			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+	}
 }
 
 /**