Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (revision 21466) +++ wp-includes/functions.php (working copy) @@ -1436,7 +1436,6 @@ $siteurl = get_option( 'siteurl' ); $upload_path = get_option( 'upload_path' ); $upload_path = trim($upload_path); - $main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site(); if ( empty($upload_path) ) { $dir = WP_CONTENT_DIR . '/uploads'; } else { @@ -1456,15 +1455,15 @@ $url = trailingslashit( $siteurl ) . $upload_path; } - if ( defined('UPLOADS') && !$main_override && ( !isset( $switched ) || $switched === false ) ) { + if ( defined( 'UPLOADS' ) ) { $dir = ABSPATH . UPLOADS; $url = trailingslashit( $siteurl ) . UPLOADS; - } - if ( is_multisite() && !$main_override && ( !isset( $switched ) || $switched === false ) ) { - if ( defined( 'BLOGUPLOADDIR' ) ) - $dir = untrailingslashit(BLOGUPLOADDIR); - $url = str_replace( UPLOADS, 'files', $url ); + // If multisite, we're not switched, and we're not on the main site (for post-MU networks), append sites/ID + if ( is_multisite() && ! ( is_main_site() && defined( 'MULTISITE' ) ) && empty( $switched ) ) { + $dir .= '/sites/' . $blog_id; + $url .= '/sites/' . $blog_id; + } } $bdir = $dir; Index: wp-includes/ms-default-constants.php =================================================================== --- wp-includes/ms-default-constants.php (revision 21466) +++ wp-includes/ms-default-constants.php (working copy) @@ -12,23 +12,8 @@ * * @since 3.0.0 */ -function ms_upload_constants( ) { - global $wpdb; +function ms_upload_constants() {} - /** @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' ) ) { - // Uploads dir relative to ABSPATH - define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" ); - if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR ) - define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" ); - } -} - /** * Defines Multisite cookie constants. * Index: wp-includes/ms-functions.php =================================================================== --- wp-includes/ms-functions.php (revision 21466) +++ wp-includes/ms-functions.php (working copy) @@ -1154,8 +1154,8 @@ // fix url. update_option('siteurl', $url); update_option('home', $url); - update_option('fileupload_url', $url . "/files" ); - update_option('upload_path', UPLOADBLOGSDIR . "/$blog_id/files"); + + update_option('upload_path', "wp-content/uploads/sites/$blog_id"); // Don't know how this should be calculated. update_option('blogname', stripslashes( $blog_title ) ); update_option('admin_email', ''); $wpdb->update( $wpdb->options, array('option_value' => ''), array('option_name' => 'admin_email') ); Index: wp-admin/network.php =================================================================== --- wp-admin/network.php (revision 21466) +++ wp-admin/network.php (working copy) @@ -15,6 +15,8 @@ /** WordPress Administration Bootstrap */ require_once( './admin.php' ); +function ms_files_rewriting_enabled() { return false; } + if ( ! is_super_admin() ) wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) ); @@ -106,7 +108,7 @@ $network_help = '

' . __('This screen allows you to configure a network as having subdomains (site1.example.com) or subdirectories (example.com/site1). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '

' . '

' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '

' . '

' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '

' . - '

' . __('Add a blogs.dir directory under /wp-content and add the designated lines of code to wp-config.php (just before /*...stop editing...*/) and .htaccess (replacing the existing WordPress rules).') . '

' . + '

' . __('Add the designated lines of code to wp-config.php (just before /*...stop editing...*/) and .htaccess (replacing the existing WordPress rules).') . '

' . '

' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '

' . '

' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with “/blog/” from the main site. This disabling will be addressed in a future version.') . '

' . '

' . __('For more information:') . '

' . @@ -360,11 +362,10 @@ } ?>
    -

  1. blogs.dir directory at %s/blogs.dir. This directory is used to store uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR ); - if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' ) - echo ' ' . __('Warning:') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . ''; - ?>

    2. +

    ' . __('Warning:') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '

    '; + ?>

  2. wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:' ), ABSPATH ); ?>

Index: wp-admin/includes/schema.php =================================================================== --- wp-admin/includes/schema.php (revision 21466) +++ wp-admin/includes/schema.php (working copy) @@ -932,7 +932,6 @@ $upload_path = substr( WP_CONTENT_DIR, strlen( ABSPATH ) ) . '/uploads'; update_option( 'upload_path', $upload_path ); } - update_option( 'fileupload_url', get_option( 'siteurl' ) . '/' . $upload_path ); } if ( $subdomain_install ) Index: wp-admin/includes/ms.php =================================================================== --- wp-admin/includes/ms.php (revision 21466) +++ wp-admin/includes/ms.php (working copy) @@ -90,7 +90,8 @@ $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; $stack = array($dir); @@ -347,8 +348,10 @@ function get_space_used() { // 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 ); + if ( false === $space_used ) { + $upload_dir = wp_upload_dir(); + $space_used = get_dirsize( $upload_dir['basedir'] ); + } return $space_used; } @@ -665,15 +668,6 @@ ' . sprintf( __( 'The %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' ) . ''; -} -add_action( 'network_admin_notices', 'ms_deprecated_blogs_file' ); - /** * Grants super admin privileges. *