Ticket #34037: 34037.diff

src/wp-includes/ms-functions.php

@@ -2296 +2296 @@
         if ( ! is_numeric( $space_allowed ) )
                 $space_allowed = get_site_option( 'blog_upload_space' );
 
-        if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
+        if ( ! is_numeric( $space_allowed ) )
                 $space_allowed = 100;
 
         /**

tests/phpunit/tests/multisite/getSpaceAllowed.php

@@ -94 +94 @@
                         array( false, false, 100 ),
                         array( 'NAN', 'NAN', 100 ),
 
-                        // These are likely unexpected.
-                        array( 0,     666,   100 ),
-                        array( false, 0,     100 ),
-                        array( 'NAN', 0,     100 ),
+                        // These effectively disable uploads.
+                        array( 0,     666,   0 ),
+                        array( false, 0,     0 ),
+                        array( 'NAN', 0,     0 ),
                 );
         }
 

tests/phpunit/tests/multisite/isUploadSpaceAvailable.php

@@ -102 +102 @@
                 $available = is_upload_space_available();
                 remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
 
-                $this->assertTrue( $available );
+                $this->assertFalse( $available );
         }
 
         function test_is_upload_space_available_upload_space_negative() {