WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If a pre-3.0 (MU era) network disables ms-files manually, they don't need /sites/ in their wp-content/uploads directory. see #19235. 

git-svn-id: http://core.svn.wordpress.org/trunk@22038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-09-27 04:56:58 +00:00
parent 8f62dfaf00
commit 143f4da6a6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/functions.php
View File

@ -1496,11 +1496,20 @@ function wp_upload_dir( $time = null ) {
$url = trailingslashit( $siteurl ) . UPLOADS;
}
// Multisite (if not the main site in a post-MU network)
// If multisite (if not the main site in a post-MU network)
if ( is_multisite() && ! ( is_main_site() && defined( 'MULTISITE' ) ) ) {
if ( ! get_site_option( 'ms_files_rewriting' ) ) {
// Append sites/%d if we're not on the main site (for post-MU networks).
$ms_dir = '/sites/' . get_current_blog_id();
// Append sites/%d if we're not on the main site (for post-MU networks). The extra directory
// prevents a four-digit ID from conflict with a year-based directory for the main site.
// If a MU-era network disables ms-files rewriting manually, they don't need the extra
// directory, as they never had wp-content/uploads for the main site.
if ( defined( 'MULTISITE' ) )
$ms_dir = '/sites/' . get_current_blog_id();
else
$ms_dir = '/' . get_current_blog_id();
$dir .= $ms_dir;
$url .= $ms_dir;
} elseif ( ! ms_is_switched() ) {