Ticket #19235: 19235.5.diff

wp-includes/ms-default-constants.php

@@ -28 +28 @@
         if ( !defined( 'UPLOADBLOGSDIR' ) )
                 define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
 
-        // The main site in a post-MU network uses wp-content/uploads.
-        // This used to be handled in wp_upload_dir() by ignoring UPLOADS for this case. Avoid defining it instead.
+        // Note, the main site in a post-MU network uses wp-content/uploads.
+        // This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
         if ( ! defined( 'UPLOADS' ) ) {
-                if ( ! ( is_main_site() && defined( 'MULTISITE' ) ) )
-                        define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+                define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
 
                 // Uploads dir relative to ABSPATH
                 if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )

wp-includes/functions.php

@@ -1503 +1503 @@
                         $url = trailingslashit( $siteurl ) . $upload_path;
         }
 
-        if ( defined( 'UPLOADS' ) ) {
+        // Obey the value of UPLOADS. This happens as long as ms-files rewriting is disabled.
+        // We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
+        if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
                 $dir = ABSPATH . UPLOADS;
                 $url = trailingslashit( $siteurl ) . UPLOADS;
         }
 
-        // If multisite (if not the main site in a post-MU network)
-        $blog_id = get_current_blog_id();
-        if ( is_multisite() && ! ( is_main_site( $blog_id ) && defined( 'MULTISITE' ) ) ) {
+        // If multisite (and 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). The extra directory
+                        // If ms-files rewriting is disabled (networks created post-3.5), it is fairly straightforward:
+                        // Append sites/%d if we're not on the main site (for post-MU networks). (The extra directory
                         // prevents a four-digit ID from conflicting with a year-based directory for the main site.
                         // But if a MU-era network has disabled ms-files rewriting manually, they don't need the extra
-                        // directory, as they never had wp-content/uploads for the main site.
+                        // directory, as they never had wp-content/uploads for the main site.)
 
+                        $blog_id = get_current_blog_id();
                         $ms_dir = defined( 'MULTISITE' ) ? '/sites/' : '/';
                         $dir .= $ms_dir . $blog_id;
                         $url .= $ms_dir . $blog_id;
-                } elseif ( ! ms_is_switched() ) {
+
+                } elseif ( defined( 'UPLOADS' ) && ! ms_is_switched() ) {
                         // Handle the old-form ms-files.php rewriting if the network still has that enabled.
+                        // When ms-files rewriting is enabled, then we only listen to UPLOADS when:
+                        //   1) we are not on the main site in a post-MU network,
+                        //      as wp-content/uploads is used there, and
+                        //   2) we are not switched, as ms_upload_constants() hardcodes
+                        //      these constants to reflect the original blog ID.
+
                         if ( defined( 'BLOGUPLOADDIR' ) )
                                 $dir = untrailingslashit( BLOGUPLOADDIR );
                         $url = str_replace( UPLOADS, 'files', $url );