sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS: Handle the possibility of 0 when checking a user's upload quota.

Browse Source 
Upload space of 0 is now more possible via r35016 and should be respected rather than modified to a default of 10MB.

Fixes #34037.


git-svn-id: https://develop.svn.wordpress.org/trunk@35017 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt 2015-10-10 23:17:01 +00:00
parent d9edf86faf
commit d5e572f992
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/ms.php
View File

@ -417,9 +417,9 @@ function upload_is_user_over_quota( $echo = true ) {
return false;
$space_allowed = get_space_allowed();
if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) )
if ( ! is_numeric( $space_allowed ) ) {
$space_allowed = 10; // Default space allowed is 10 MB
}
$space_used = get_space_used();
if ( ( $space_allowed - $space_used ) < 0 ) {

8
tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
View File

@ -27,12 +27,6 @@ class Tests_Multisite_Upload_Is_User_Over_Quota extends WP_UnitTestCase {
parent::tearDown();
}
/**
* In this scenario, 10 is set as the spaced allowed when 0 is returned
* by `get_space_allowed()` inside `upload_is_user_over_quota()`.
*
* This is likely not expected behavior.
*/
public function test_upload_is_user_over_quota_allowed_0_used_5() {
add_filter( 'get_space_allowed', '__return_zero' );
add_filter( 'pre_get_space_used', array( $this, '_filter_space_5' ) );
@ -40,7 +34,7 @@ class Tests_Multisite_Upload_Is_User_Over_Quota extends WP_UnitTestCase {
remove_filter( 'get_space_allowed', '__return_zero' );
remove_filter( 'pre_get_space_used', array( $this, '_filter_space_5' ) );
$this->assertFalse( $result );
$this->assertTrue( $result );
}
public function test_upload_is_user_over_quota_allowed_0_used_0() {