Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2019-02-14 19:06:14 +0300
committerDaniel Kesselberg <mail@danielkesselberg.de>2019-02-14 19:06:14 +0300
commit659ed3ecda733d53414528124014d5060fcb652e (patch)
treef428931ff5506cdcbb9f30d1b57c6de4cc0d9068 /apps/files_external/lib/Lib
parente65f7f05de6443bd66b1c31325cbc3cbe149d1e5 (diff)
Prefix $path for filename for internal file cache
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'apps/files_external/lib/Lib')
-rw-r--r--apps/files_external/lib/Lib/Storage/AmazonS3.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index 9d2e0c91099..6e381d5f15c 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -309,7 +309,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$files[] = $file;
// store this information for later usage
- $this->filesCache[$file] = [
+ $this->filesCache[$path . $file] = [
'ContentLength' => $object['Size'],
'LastModified' => (string)$object['LastModified'],
];
@@ -408,7 +408,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
try {
- if ($this->headObject($path)) {
+ if (isset($this->filesCache[$path]) && $this->headObject($path)) {
return 'file';
}
if ($this->headObject($path . '/')) {