WordPress.org

Make WordPress Core

Changeset 35016


Ignore:
Timestamp:
10/10/2015 11:14:11 PM (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/ms-functions.php

    r34916 r35016  
    22972297        $space_allowed = get_site_option( 'blog_upload_space' );
    22982298
    2299     if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
     2299    if ( ! is_numeric( $space_allowed ) )
    23002300        $space_allowed = 100;
    23012301
  • trunk/tests/phpunit/tests/multisite/getSpaceAllowed.php

    r34900 r35016  
    9595            array( 'NAN', 'NAN', 100 ),
    9696
    97             // These are likely unexpected.
    98             array( 0,     666,   100 ),
    99             array( false, 0,     100 ),
    100             array( 'NAN', 0,     100 ),
     97            // These effectively disable uploads.
     98            array( 0,     666,   0 ),
     99            array( false, 0,     0 ),
     100            array( 'NAN', 0,     0 ),
    101101        );
    102102    }
  • trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php

    r34899 r35016  
    103103        remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
    104104
    105         $this->assertTrue( $available );
     105        $this->assertFalse( $available );
    106106    }
    107107
Note: See TracChangeset for help on using the changeset viewer.