From e6b0d64b4e1db79b34041bb3c4091ff15f0945ed Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 26 Jan 2010 20:02:11 +0000 Subject: [PATCH] Integrate fix_upload_details() into wp_upload_dir(). see #11644 git-svn-id: http://svn.automattic.com/wordpress/trunk@12851 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 7 +++++-- wp-includes/ms-default-filters.php | 1 - wp-includes/ms-functions.php | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index c83e92a39..e79a42c03 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2062,8 +2062,11 @@ function wp_upload_dir( $time = null ) { $url = trailingslashit( $siteurl ) . UPLOADS; } - if ( is_multisite() && defined( 'BLOGUPLOADDIR' ) ) - $dir = untrailingslashit(BLOGUPLOADDIR); + if ( is_multisite() ) { + if ( defined( 'BLOGUPLOADDIR' ) ) + $dir = untrailingslashit(BLOGUPLOADDIR); + $url = str_replace( UPLOADS, 'files', $url ); + } $bdir = $dir; $burl = $url; diff --git a/wp-includes/ms-default-filters.php b/wp-includes/ms-default-filters.php index d7775c55e..857ea9ea7 100644 --- a/wp-includes/ms-default-filters.php +++ b/wp-includes/ms-default-filters.php @@ -36,7 +36,6 @@ add_action ( 'publish_post', 'wpmu_update_blogs_date' ); add_filter ( 'wp_upload_bits', 'upload_is_file_too_big' ); add_filter ( 'import_upload_size_limit', 'fix_import_form_size' ); add_filter ( 'upload_mimes', 'check_upload_mimes' ); -add_filter ( 'upload_dir', 'fix_upload_details' ); // Mail add_filter ( 'wp_mail_from', 'wordpressmu_wp_mail_from' ); diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 848fa17c0..7c9b1b52c 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1626,12 +1626,6 @@ function get_most_recent_post_of_user( $user_id ) { } /* Misc functions */ -function fix_upload_details( $uploads ) { - $uploads['url'] = str_replace( UPLOADS, "files", $uploads['url'] ); - $uploads['baseurl'] = str_replace( UPLOADS, "files", $uploads['baseurl'] ); - return $uploads; -} - function get_dirsize( $directory ) { $dirsize = get_transient( 'dirsize_cache' ); if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )