Changeset 22038

Timestamp:

09/27/2012 04:56:58 AM (12 years ago)

Author:

nacin

Message:

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.

File:

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

trunk/wp-includes/functions.php

@@ -1497 +1497 @@
     }
 
-    // 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;