tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

API Shorten overly-verbose invalid extension error (#6231)

Browse Source 
Fixes #6198
This commit is contained in:
Damian Mooyman 2016-10-28 15:20:49 +13:00 committed by Sam Minnée
parent adfd0456de
commit 1734e0d2a3
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Upload_Validator.php
View File

@ -277,10 +277,8 @@ class Upload_Validator
// extension validation
if (!$this->isValidExtension()) {
$this->errors[] = _t(
'File.INVALIDEXTENSION',
'Extension is not allowed (valid: {extensions})',
'Argument 1: Comma-separated list of valid extensions',
array('extensions' => wordwrap(implode(', ', $this->allowedExtensions)))
'File.INVALIDEXTENSION_SHORT',
'Extension is not allowed'
);
return false;
}

6
tests/filesystem/UploadTest.php
View File

@ -831,10 +831,8 @@ class UploadTest_Validator extends Upload_Validator implements TestOnly {
// extension validation
if(!$this->isValidExtension()) {
$this->errors[] = _t(
'File.INVALIDEXTENSION',
'Extension is not allowed (valid: {extensions})',
'Argument 1: Comma-separated list of valid extensions',
array('extensions' => implode(',', $this->allowedExtensions))
'File.INVALIDEXTENSION_SHORT',
'Extension is not allowed'
);
return false;
}