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

Timestamp:

10/12/2012 10:05:02 PM (12 years ago)

Author:

nacin

Message:

Have wp_upload_dir() account for blog switching, ms-files rewriting, and the UPLOADS constant properly. This type of logic needs a lot of code comments.

Prevents wp_upload_dir() from obeying the UPLOADS constant when ms-files rewriting is enabled and a blog is switched.

Reverts [22106] thanks to [22108].

see #19235.

File:

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

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

@@ -29 +29 @@
         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