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:
parent
bfe35227d3
commit
6c39dc36e4
|
@ -2136,7 +2136,7 @@ function wp_upload_dir( $time = null ) {
|
||||||
$url = trailingslashit( $siteurl ) . UPLOADS;
|
$url = trailingslashit( $siteurl ) . UPLOADS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( is_multisite() ) {
|
if ( is_multisite() && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
|
||||||
if ( defined( 'BLOGUPLOADDIR' ) )
|
if ( defined( 'BLOGUPLOADDIR' ) )
|
||||||
$dir = untrailingslashit(BLOGUPLOADDIR);
|
$dir = untrailingslashit(BLOGUPLOADDIR);
|
||||||
$url = str_replace( UPLOADS, 'files', $url );
|
$url = str_replace( UPLOADS, 'files', $url );
|
||||||
|
|
Loading…
Reference in New Issue