Merge mu_upload_dir() into wp_upload_dir(). see #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@12850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-26 19:04:55 +00:00
parent 2df0c3eabe
commit 40570257b1
2 changed files with 3 additions and 11 deletions
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2062,6 +2062,9 @@ function wp_upload_dir( $time = null ) {
 		$url = trailingslashit( $siteurl ) . UPLOADS;
 	}

+	if ( is_multisite() && defined( 'BLOGUPLOADDIR' ) )
+		$dir = untrailingslashit(BLOGUPLOADDIR);
+
 	$bdir = $dir;
 	$burl = $url;