IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate fix_upload_details() into wp_upload_dir(). see #11644

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-01-26 20:02:11 +00:00
parent 40570257b1
commit e6b0d64b4e
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/functions.php
View File

@@ -2062,8 +2062,11 @@ function wp_upload_dir( $time = null ) {
$url = trailingslashit( $siteurl ) . UPLOADS;
}
if ( is_multisite() && defined( 'BLOGUPLOADDIR' ) )
$dir = untrailingslashit(BLOGUPLOADDIR);
if ( is_multisite() ) {
if ( defined( 'BLOGUPLOADDIR' ) )
$dir = untrailingslashit(BLOGUPLOADDIR);
$url = str_replace( UPLOADS, 'files', $url );
}
$bdir = $dir;
$burl = $url;