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

Don't delete all assets when uploading a file in the root

Browse Source 
Catch "." dirnames in more places. truncateDirectory('.') will delete every asset. That's an undesirable thing.
findVariants() wouldn't return any variants if the dirname in "."
This commit is contained in:
Mike Cochrane 2016-03-08 13:12:07 +13:00
parent 7b2124004a
commit e03115198f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filesystem/flysystem/FlysystemAssetStore.php
View File

@ -330,6 +330,7 @@ class FlysystemAssetStore implements AssetStore, AssetStoreRouter, Flushable {
*/
protected function truncateDirectory($dirname, Filesystem $filesystem) {
if ($dirname
&& ltrim(dirname($dirname), '.')
&& ! Config::inst()->get(get_class($this), 'keep_empty_dirs')
&& ! $filesystem->listContents($dirname)
) {
@ -346,7 +347,8 @@ class FlysystemAssetStore implements AssetStore, AssetStoreRouter, Flushable {
* @return Generator
*/
protected function findVariants($fileID, Filesystem $filesystem) {
foreach($filesystem->listContents(dirname($fileID)) as $next) {
$dirname = ltrim(dirname($fileID), '.');
foreach($filesystem->listContents($dirname) as $next) {
if($next['type'] !== 'file') {
continue;
}