golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@12850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-26 19:04:55 +00:00
parent 2df0c3eabe
commit 40570257b1
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/functions.php
View File

@ -2062,6 +2062,9 @@ function wp_upload_dir( $time = null ) {
$url = trailingslashit( $siteurl ) . UPLOADS;
}
if ( is_multisite() && defined( 'BLOGUPLOADDIR' ) )
$dir = untrailingslashit(BLOGUPLOADDIR);
$bdir = $dir;
$burl = $url;

11
wp-includes/ms-functions.php
View File

@ -1998,17 +1998,6 @@ function lowercase_username( $username, $raw_username, $strict ) {
}
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');
if ( $registration == 'all' || $registration == 'user' )