From bb16bd8e73015252393cf01208d15faab73131e4 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Thu, 14 Feb 2019 18:06:09 +0100 Subject: [PATCH] Don't strip path from directory prefix Signed-off-by: Daniel Kesselberg --- apps/files_external/lib/Lib/Storage/AmazonS3.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 019bfa17b3..befa656710 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -335,7 +335,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { if (is_array($result['CommonPrefixes'])) { foreach ($result['CommonPrefixes'] as $prefix) { $files[] = substr(trim($prefix['Prefix'], '/'), strlen($path)); - $this->directoryCache[substr(trim($prefix['Prefix'], '/'), strlen($path))] = true; + $this->directoryCache[trim($prefix['Prefix'], '/')] = true; } } if (is_array($result['Contents'])) { @@ -433,6 +433,11 @@ class AmazonS3 extends \OC\Files\Storage\Common { public function is_dir($path) { $path = $this->normalizePath($path); + + if (isset($this->filesCache[$path])) { + return false; + } + try { return $this->isRoot($path) || $this->doesDirectoryExist($path); } catch (S3Exception $e) {