golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

additional checks on allow existing media path, see #12549 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13631 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-03-09 18:08:25 +00:00
parent bfe35227d3
commit 6c39dc36e4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/functions.php
View File

@ -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 );