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

git-svn-id: https://develop.svn.wordpress.org/trunk@17085 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2010-12-20 16:44:33 +00:00
parent 76e77b1790
commit f5ab190c44

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() );
} }
/** /**