From 29e618f33ae8d60ee68cff94c196bdd754e33ba5 Mon Sep 17 00:00:00 2001
From: Ron Rennick <wpmuguru@git.wordpress.org>
Date: Tue, 9 Mar 2010 18:08:25 +0000
Subject: [PATCH] additional checks on allow existing media path, see #12549

git-svn-id: https://develop.svn.wordpress.org/trunk@13631 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 78d699d6d4..4d4ea3a70f 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2136,7 +2136,7 @@ function wp_upload_dir( $time = null ) {
 		$url = trailingslashit( $siteurl ) . UPLOADS;
 	}
 
-	if ( is_multisite() ) {
+	if ( is_multisite() && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
 		if ( defined( 'BLOGUPLOADDIR' ) )
 			$dir = untrailingslashit(BLOGUPLOADDIR);
 		$url = str_replace( UPLOADS, 'files', $url );