upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 59

Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename

Browse source 
Do not remove dir entry if it has the same name as the parent
This commit is contained in:
Jörn Friedrich Dreyer 2014-11-14 10:37:10 +01:00
commit df18bd3e0d
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/files_external/lib/amazons3.php
View file

@ -267,10 +267,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$file = basename(
isset($object['Key']) ? $object['Key'] : $object['Prefix']
);
if ($file != basename($path)) {
$files[] = $file;
}
$files[] = $file;
}
\OC\Files\Stream\Dir::register('amazons3' . $path, $files);