Changeset 35017

Timestamp:

10/10/2015 11:17:01 PM (11 years ago)

Author:

jeremyfelt

Message:

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

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

Fixes #34037.

Location:

trunk

Files:

• src/wp-admin/includes/ms.php (modified) (1 diff)
• tests/phpunit/tests/multisite/uploadIsUserOverQuota.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ms.php

@@ -418 +418 @@
 
         $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();
 

trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php

@@ -28 +28 @@
         }
 
-        /**
-         * 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' );
@@ -41 +35 @@
                 remove_filter( 'pre_get_space_used', array( $this, '_filter_space_5' ) );
 
-                $this->assertFalse( $result );
+                $this->assertTrue( $result );
         }