diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-11-14 10:37:10 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-11-14 10:37:10 +0100 |
| commit | df18bd3e0d9288a443a31ed75443c68917eb516d (patch) | |
| tree | 466f371c5f1c73d59412a035b9274535079fe00b /apps | |
| parent | 0811b39e5f53249075b347a279b3089c839f9859 (diff) | |
| parent | 914f4cb6f2755b1856bc3d169292aa5eaddff59d (diff) | |
| download | nextcloud-server-df18bd3e0d9288a443a31ed75443c68917eb516d.tar.gz nextcloud-server-df18bd3e0d9288a443a31ed75443c68917eb516d.zip | |
Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename
Do not remove dir entry if it has the same name as the parent
Diffstat (limited to 'apps')
| -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); |