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

Merge pull request #5155 from mikenz/patch-3

Browse Source 
Don't delete all assets when uploading a file in the root
This commit is contained in:
Damian Mooyman 2016-03-08 13:35:00 +13:00
commit 016ea2efb1
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) { protected function truncateDirectory($dirname, Filesystem $filesystem) {
if ($dirname if ($dirname
&& ltrim(dirname($dirname), '.')
&& ! Config::inst()->get(get_class($this), 'keep_empty_dirs') && ! Config::inst()->get(get_class($this), 'keep_empty_dirs')
&& ! $filesystem->listContents($dirname) && ! $filesystem->listContents($dirname)
) { ) {
@ -346,7 +347,8 @@ class FlysystemAssetStore implements AssetStore, AssetStoreRouter, Flushable {
* @return Generator * @return Generator
*/ */
protected function findVariants($fileID, Filesystem $filesystem) { 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') { if($next['type'] !== 'file') {
continue; continue;
} }