From 022e5c222789ec8c2f6b9c8c0a5105547d4fa65d Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 28 Aug 2013 03:35:44 +0000 Subject: [PATCH] The main site of a secondary network should not use the original wp-content/uploads upload path. props jeremyfelt. fixes #25030. git-svn-id: https://develop.svn.wordpress.org/trunk@25148 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index 0965dbe3b9..5db7e4adcf 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -1554,7 +1554,7 @@ function wp_upload_dir( $time = null ) { } // If multisite (and if not the main site in a post-MU network) - if ( is_multisite() && ! ( is_main_site() && defined( 'MULTISITE' ) ) ) { + if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) { if ( ! get_site_option( 'ms_files_rewriting' ) ) { // If ms-files rewriting is disabled (networks created post-3.5), it is fairly straightforward: