upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

chore(s3): fully resolve conflict in S3ObjectTrait

Browse source 
Signed-off-by: Josh <josh.t.richards@gmail.com>
This commit is contained in:
Josh 2026-04-25 11:16:56 -04:00 committed by GitHub
parent 617803fc10
commit 1989ae9865
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Files/ObjectStore/S3ObjectTrait.php
View file

@ -272,7 +272,7 @@ trait S3ObjectTrait {
* @throws S3Exception|\Exception if there is an unhandled exception
*/
public function objectExists($urn) {
return $this->getConnection()->doesObjectExistV2($this->bucket, $urn, false, $this->getSSECParameters());
return $this->getConnection()->doesObjectExistV2($this->bucket, $urn, false, $this->getServerSideEncryptionParameters());
}
public function copyObject($from, $to, array $options = []) {