tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 05:09:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6291 from dhensby/pulls/3.4/fix-uploadfield-max-size

Browse Source 
FIX UploadField incorrectly setting max upload size
This commit is contained in:
Daniel Hensby 2016-11-24 12:40:04 +00:00 committed by GitHub
commit 464af18346
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
forms/UploadField.php
View File

@ -220,11 +220,6 @@ class UploadField extends FileField {
$this->getValidator()->setAllowedExtensions( $this->getValidator()->setAllowedExtensions(
array_filter(Config::inst()->get('File', 'allowed_extensions')) array_filter(Config::inst()->get('File', 'allowed_extensions'))
); );
// get the lower max size
$maxUpload = File::ini2bytes(ini_get('upload_max_filesize'));
$maxPost = File::ini2bytes(ini_get('post_max_size'));
$this->getValidator()->setAllowedMaxFileSize(min($maxUpload, $maxPost));
} }
/** /**