Changeset 12850

Timestamp:

01/26/2010 07:04:55 PM (14 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/functions.php

@@ -2062 +2062 @@
         $url = trailingslashit( $siteurl ) . UPLOADS;
     }
+
+    if ( is_multisite() && defined( 'BLOGUPLOADDIR' ) )
+        $dir = untrailingslashit(BLOGUPLOADDIR);
 
     $bdir = $dir;

trunk/wp-includes/ms-functions.php

@@ -1999 +1999 @@
 add_filter( 'sanitize_user', 'lowercase_username', 10, 3 );
 
-function mu_upload_dir( $uploads ) {
-    $dir = $uploads[ 'basedir' ];
-    if ( defined( 'BLOGUPLOADDIR' ) )
-        $dir = constant( 'BLOGUPLOADDIR' );
-    $dir = untrailingslashit( $dir ) . $uploads[ 'subdir' ];
-    $uploads[ 'path' ] = $dir;
-
-    return $uploads;
-}
-add_filter( 'upload_dir', 'mu_upload_dir' );
-
 function users_can_register_signup_filter() {
     $registration = get_site_option('registration');