From 1989ae9865202ab7bdc57ec29d67de6567a2b137 Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Sat, 25 Apr 2026 11:16:56 -0400
Subject: [PATCH] chore(s3): fully resolve conflict in S3ObjectTrait

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 lib/private/Files/ObjectStore/S3ObjectTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
index 23ad72ef587..0c98356d6b8 100644
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -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 = []) {