Changeset 13632

Timestamp:

03/09/2010 06:19:28 PM (15 years ago)

Author:

wpmuguru

Message:

Dont define BLOGUPLOADDIR if UPLOADS is defined, see #12558

File:

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

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

@@ -16 +16 @@
 
     /** @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/" );
+    }
 }