]> source.dussan.org Git - nextcloud-server.git/commitdiff
Do not remove dir entry if it has the same name as the parent
authorVincent Petry <pvince81@owncloud.com>
Thu, 13 Nov 2014 16:37:56 +0000 (17:37 +0100)
committerMorris Jobke <hey@morrisjobke.de>
Thu, 11 Dec 2014 22:57:17 +0000 (23:57 +0100)
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.

apps/files_external/lib/amazons3.php

index a3fe183f30ecead3489a0ec6edca673eefb0b5c1..bc1b56fd9fddce8a826d85033ae0d6e52ad0f83b 100644 (file)
@@ -266,10 +266,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);