diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-02-19 12:01:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 12:01:08 +0100 |
| commit | 7fc68fe93ec6248df68a0ad492f19a31b75b3e75 (patch) | |
| tree | 71c9e826317faeedcf7ff2ebf8bf98c34a5695e5 | |
| parent | 993609cf51067066a764830dd17c49a9024cf04d (diff) | |
| parent | 0d667d18bb9d76e8ffad48b270545dde76fc156e (diff) | |
| download | nextcloud-server-7fc68fe93ec6248df68a0ad492f19a31b75b3e75.tar.gz nextcloud-server-7fc68fe93ec6248df68a0ad492f19a31b75b3e75.zip | |
Merge pull request #14211 from nextcloud/bugfix/prefix-path-to-filecache-s3
Prefix $path for filename for internal file cache
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/AmazonS3.php | 4 |
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..ea7ca42dfef 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 . '/')) { |