diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-11-13 17:37:56 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-11-13 17:37:56 +0100 |
| commit | 914f4cb6f2755b1856bc3d169292aa5eaddff59d (patch) | |
| tree | f2dcc513e5298175e0a451d2040eb08ce11a037d | |
| parent | 559b34e53d1adda66e12b3bd0c7a7459c9304a5c (diff) | |
| download | nextcloud-server-914f4cb6f2755b1856bc3d169292aa5eaddff59d.tar.gz nextcloud-server-914f4cb6f2755b1856bc3d169292aa5eaddff59d.zip | |
Do not remove dir entry if it has the same name as the parent
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
| -rw-r--r-- | apps/files_external/lib/amazons3.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 53adb929e29..4d94e3561f8 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -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); |