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

Don’t add extension dot in FileNameFilter

Browse Source 
File names are generally valid without an extension (although they might be disallowed by upload constraints),
so the filter should deal gracefully with them (“myfile” should return “myfile”, not “myfile.”)
This commit is contained in:
Ingo Schommer 2017-01-13 10:40:44 +13:00
parent b1d5e97a3d
commit 3b06e30558
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Assets/FileNameFilter.php
View File

@ -77,7 +77,8 @@ class FileNameFilter extends Object
// Safeguard against empty file names // Safeguard against empty file names
$nameWithoutExt = pathinfo($name, PATHINFO_FILENAME); $nameWithoutExt = pathinfo($name, PATHINFO_FILENAME);
if (empty($nameWithoutExt)) { if (empty($nameWithoutExt)) {
$name = $this->getDefaultName() . '.' . $ext; $name = $this->getDefaultName();
$name .= $ext ? '.' . $ext : '';
} }
return $name; return $name;

7
tests/php/Assets/FileNameFilterTest.php
View File

@ -142,4 +142,11 @@ class FileNameFilterTest extends SapphireTest
$filter = new FileNameFilter(); $filter = new FileNameFilter();
$this->assertEquals('test-document.txt', $filter->filter($name)); $this->assertEquals('test-document.txt', $filter->filter($name));
} }
public function testDoesntAddExtensionWhenMissing()
{
$name = 'no-extension';
$filter = new FileNameFilter();
$this->assertEquals('no-extension', $filter->filter($name));
}
} }