WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't check the upload space site option if the option is disabled. props greuben, fixes #13601. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-20 16:44:33 +00:00
parent e8468d167a
commit e68063f9f3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/ms.php
View File

@ -347,6 +347,9 @@ function is_upload_space_available() {
*/ */
function upload_size_limit_filter( $size ) { function upload_size_limit_filter( $size ) {
$fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 ); $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
if ( get_site_option( 'upload_space_check_disabled' ) )
return min( $size, $fileupload_maxk );
return min( $size, $fileupload_maxk, get_upload_space_available() ); return min( $size, $fileupload_maxk, get_upload_space_available() );
} }
/** /**