From 59fe0e60fa8dd689a1655d155079d148870d4b78 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Tue, 9 Mar 2010 18:19:28 +0000 Subject: [PATCH] Dont define BLOGUPLOADDIR if UPLOADS is defined, see #12558 git-svn-id: https://develop.svn.wordpress.org/trunk@13632 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/ms-default-constants.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php index 2447d81d44..931e94e996 100644 --- a/wp-includes/ms-default-constants.php +++ b/wp-includes/ms-default-constants.php @@ -15,16 +15,17 @@ function ms_upload_constants( ) { 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/" ); + } } /**