Changeset 35016

Timestamp:

10/10/2015 11:14:11 PM (11 years ago)

Author:

jeremyfelt

Message:

MS: Allow for a blog_upload_space setting of 0 to restrict uploads.

Previously, an value matching empty() would have been bypassed in favor of the default setting for 100MB.

Related #19538, r19639, r19652, where we saw the bug, fixed the bug, and then unfixed the bug so that it was not a surprise in a point release.

See #34037.

Location:

trunk

Files:

• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/multisite/getSpaceAllowed.php (modified) (1 diff)
• tests/phpunit/tests/multisite/isUploadSpaceAvailable.php (modified) (1 diff)

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

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

trunk/tests/phpunit/tests/multisite/getSpaceAllowed.php

@@ -95 +95 @@
                         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 ),
                 );
         }

trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php

@@ -103 +103 @@
                 remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
 
-                $this->assertTrue( $available );
+                $this->assertFalse( $available );
         }