Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Properly set the base URL for the main site when ms-files rewriting is enabled for MU-era installs.

Browse Source 
Props nacin
fixes #22702


git-svn-id: http://core.svn.wordpress.org/trunk@23002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-12-03 22:24:06 +00:00
parent 98d175c03b
commit 20d9c165ee
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/functions.php
View File

@ -1537,10 +1537,17 @@ function wp_upload_dir( $time = null ) {
// as wp-content/uploads is used there, and // as wp-content/uploads is used there, and
// 2) we are not switched, as ms_upload_constants() hardcodes // 2) we are not switched, as ms_upload_constants() hardcodes
// these constants to reflect the original blog ID. // these constants to reflect the original blog ID.
//
// Rather than UPLOADS, we actually use BLOGUPLOADDIR if it is set, as it is absolute.
// (And it will be set, see ms_upload_constants().) Otherwise, UPLOADS can be used, as
// as it is relative to ABSPATH. For the final piece: when UPLOADS is used with ms-files
// rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
if ( defined( 'BLOGUPLOADDIR' ) ) if ( defined( 'BLOGUPLOADDIR' ) )
$dir = untrailingslashit( BLOGUPLOADDIR ); $dir = untrailingslashit( BLOGUPLOADDIR );
$url = str_replace( untrailingslashit( UPLOADS ), 'files', $url ); else
$dir = ABSPATH . UPLOADS;
$url = trailingslashit( $siteurl ) . 'files';
} }
} }