Changeset 12851

Timestamp:

01/26/2010 08:02:11 PM (15 years ago)

Author:

ryan

Message:

Integrate fix_upload_details() into wp_upload_dir(). see #11644

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• ms-default-filters.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -2063 +2063 @@
     }
 
-    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;

trunk/wp-includes/ms-default-filters.php

@@ -37 +37 @@
 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

trunk/wp-includes/ms-functions.php

@@ -1627 +1627 @@
 
 /* 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' );