Changeset 25148

Timestamp:

08/28/2013 03:35:44 AM (11 years ago)

Author:

nacin

Message:

The main site of a secondary network should not use the original wp-content/uploads upload path.

props jeremyfelt.
fixes #25030.

File:

• trunk/src/wp-includes/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -1555 +1555 @@
 
     // 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' ) ) {