WordPress.org

Make WordPress Core

Changeset 12851


Ignore:
Timestamp:
01/26/2010 08:02:11 PM (10 years ago)
Author:
ryan
Message:

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

Location:
trunk/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/functions.php

    r12850 r12851  
    20632063    }
    20642064
    2065     if ( is_multisite() && defined( 'BLOGUPLOADDIR' ) )
    2066         $dir = untrailingslashit(BLOGUPLOADDIR);
     2065    if ( is_multisite() ) {
     2066        if ( defined( 'BLOGUPLOADDIR' ) )
     2067            $dir = untrailingslashit(BLOGUPLOADDIR);
     2068        $url = str_replace( UPLOADS, 'files', $url );
     2069    }
    20672070
    20682071    $bdir = $dir;
  • trunk/wp-includes/ms-default-filters.php

    r12610 r12851  
    3737add_filter ( 'import_upload_size_limit', 'fix_import_form_size' );
    3838add_filter ( 'upload_mimes', 'check_upload_mimes' );
    39 add_filter ( 'upload_dir', 'fix_upload_details' );
    4039
    4140// Mail
  • trunk/wp-includes/ms-functions.php

    r12850 r12851  
    16271627
    16281628/* Misc functions */
    1629 function fix_upload_details( $uploads ) {
    1630     $uploads['url'] = str_replace( UPLOADS, "files", $uploads['url'] );
    1631     $uploads['baseurl'] = str_replace( UPLOADS, "files", $uploads['baseurl'] );
    1632     return $uploads;
    1633 }
    1634 
    16351629function get_dirsize( $directory ) {
    16361630    $dirsize = get_transient( 'dirsize_cache' );
Note: See TracChangeset for help on using the changeset viewer.