]> 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)
committerVincent Petry <pvince81@owncloud.com>
Thu, 13 Nov 2014 16:37:56 +0000 (17:37 +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 53adb929e29c6a6c8d1b9326186a9deb93e15c88..4d94e3561f8625c864c80a72f5c50a40e21affac 100644 (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);