WordPress.org

Make WordPress Core

Ticket #12558: 12558.diff

File 12558.diff, 910 bytes (added by ryan, 8 years ago)
  • wp-includes/ms-default-constants.php

     
    1515        global $wpdb;
    1616
    1717        /** @since 3.0.0 */
     18        // Base uploads dir relative to ABSPATH
    1819        if ( !defined( 'UPLOADBLOGSDIR' ) )
    1920                define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
    2021
    2122        /** @since 3.0.0 */
    22         if ( !defined( 'UPLOADS' ) )
     23        if ( !defined( 'UPLOADS' ) ) {
     24                // Uploads dir relative to ABSPATH
    2325                define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
    24 
    25         /** @since 3.0.0 */
    26         if ( !defined( 'BLOGUPLOADDIR' ) )
    27                 define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
     26                if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR )
     27                        define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
     28        }
    2829}
    2930
    3031/**