Ticket #12558: 12558.diff

wp-includes/ms-default-constants.php

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