Index: trunk/wp-admin/includes/ms.php =================================================================== --- trunk/wp-admin/includes/ms.php (revision 21813) +++ trunk/wp-admin/includes/ms.php (revision 21823) @@ -91,5 +91,6 @@ $wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) ); - $dir = apply_filters( 'wpmu_delete_blog_upload_dir', WP_CONTENT_DIR . "/blogs.dir/{$blog_id}/files/", $blog_id ); + $uploads = wp_upload_dir(); + $dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id ); $dir = rtrim( $dir, DIRECTORY_SEPARATOR ); $top_dir = $dir; @@ -358,6 +359,8 @@ // Allow for an alternative way of tracking storage space used $space_used = apply_filters( 'pre_get_space_used', false ); - if ( false === $space_used ) - $space_used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024; + if ( false === $space_used ) { + $upload_dir = wp_upload_dir(); + $space_used = get_dirsize( $upload_dir['basedir'] ) / 1024 / 1024; + } return $space_used; @@ -683,13 +686,4 @@ } -function ms_deprecated_blogs_file() { - if ( ! is_super_admin() ) - return; - if ( ! file_exists( WP_CONTENT_DIR . '/blogs.php' ) ) - return; - echo '
%1$s
file is deprecated. Please remove it and update your server rewrite rules to use %2$s
instead.' ), 'wp-content/blogs.php', 'wp-includes/ms-files.php' ) . '