diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-02-19 12:49:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 12:49:11 +0100 |
| commit | a605e12af21163dd2329922f596241a5af55f842 (patch) | |
| tree | ebf71c5a4f4a6f176a19894167ae441e924570ad | |
| parent | a2cddf259ce3a936c719d23b8939c73e2ec2f8e4 (diff) | |
| parent | bc718896571c1f59b67ede30302561caaf68420e (diff) | |
| download | nextcloud-server-a605e12af21163dd2329922f596241a5af55f842.tar.gz nextcloud-server-a605e12af21163dd2329922f596241a5af55f842.zip | |
Merge pull request #14288 from nextcloud/backport/14211/stable15
[stable15] 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 . '/')) { |