Changeset 21892 for trunk/wp-includes/ms-default-constants.php

Timestamp:

09/18/2012 06:07:18 PM (12 years ago)

Author:

nacin

Message:

Account for the old 'main override' in wp_upload_dir() for the main site in a post-MU network by declining to define the UPLOADS constant.

Fixes uploads on the main site of a post-MU network that uses ms-files rewriting. see #19235.

File:

• trunk/wp-includes/ms-default-constants.php (modified) (1 diff)

trunk/wp-includes/ms-default-constants.php

@@ -25 +25 @@
         return;
 
-    /** @since 3.0.0 */
     // Base uploads dir relative to ABSPATH
     if ( !defined( 'UPLOADBLOGSDIR' ) )
         define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
 
-    /** @since 3.0.0 */
-    if ( !defined( 'UPLOADS' ) ) {
+    // 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.
+    if ( ! defined( 'UPLOADS' ) ) {
+        if ( ! ( is_main_site() && defined( 'MULTISITE' ) ) )
+            define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+
         // Uploads dir relative to ABSPATH
-        define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
         if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
             define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );