WordPress.org

Make WordPress Core

Changeset 12850


Ignore:
Timestamp:
01/26/2010 07:04:55 PM (10 years ago)
Author:
ryan
Message:

Merge mu_upload_dir() into wp_upload_dir(). see #11644

Location:
trunk/wp-includes
Files:
2 edited

Legend:

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

    r12827 r12850  
    20622062        $url = trailingslashit( $siteurl ) . UPLOADS;
    20632063    }
     2064
     2065    if ( is_multisite() && defined( 'BLOGUPLOADDIR' ) )
     2066        $dir = untrailingslashit(BLOGUPLOADDIR);
    20642067
    20652068    $bdir = $dir;
  • trunk/wp-includes/ms-functions.php

    r12849 r12850  
    19991999add_filter( 'sanitize_user', 'lowercase_username', 10, 3 );
    20002000
    2001 function mu_upload_dir( $uploads ) {
    2002     $dir = $uploads[ 'basedir' ];
    2003     if ( defined( 'BLOGUPLOADDIR' ) )
    2004         $dir = constant( 'BLOGUPLOADDIR' );
    2005     $dir = untrailingslashit( $dir ) . $uploads[ 'subdir' ];
    2006     $uploads[ 'path' ] = $dir;
    2007 
    2008     return $uploads;
    2009 }
    2010 add_filter( 'upload_dir', 'mu_upload_dir' );
    2011 
    20122001function users_can_register_signup_filter() {
    20132002    $registration = get_site_option('registration');
Note: See TracChangeset for help on using the changeset viewer.