Merge pull request #4366 from nextcloud/fix/4364

fix: Apply proper default timezone for watermarks

Author: elzody

lib/Controller/WopiController.php

@@ -205,9 +205,13 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 		$share = $this->getShareForWopiToken($wopi);
 		if ($this->permissionManager->shouldWatermark($file, $wopi->getEditorUid(), $share)) {
 			$email = $user !== null && !$isPublic ? $user->getEMailAddress() : '';
+			$currentDateTime = new \DateTime(
+				'now',
+				new \DateTimeZone($this->config->getSystemValueString('default_timezone', 'UTC'))
+			);
 			$replacements = [
 				'userId' => $wopi->getEditorUid(),
-				'date' => (new \DateTime())->format('Y-m-d H:i:s'),
+				'date' => $currentDateTime->format('Y-m-d H:i:s'),
 				'themingName' => \OC::$server->getThemingDefaults()->getName(),
 				'userDisplayName' => $userDisplayName,
 				'email' => $email,