Skip to content
Snippets Groups Projects
Commit df18bd3e authored by Jörn Friedrich Dreyer's avatar Jörn Friedrich Dreyer
Browse files

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

Do not remove dir entry if it has the same name as the parent
parents 0811b39e 914f4cb6
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment