WordPress.org

Make WordPress Core


Ignore:
Timestamp:
03/09/2010 06:19:28 PM (12 years ago)
Author:
wpmuguru
Message:

Dont define BLOGUPLOADDIR if UPLOADS is defined, see #12558

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/ms-default-constants.php

    r13622 r13632  
    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
Note: See TracChangeset for help on using the changeset viewer.