Merge pull request #2398 from nextcloud/backport/2397/stable4

[stable4] (fix) default timezone for export
nextcloud · Nov 6, 2024 · ddb7d8d · ddb7d8d
2 parents 16762c9 + 2467c91
commit ddb7d8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Service/SubmissionService.php b/lib/Service/SubmissionService.php
@@ -207,7 +207,7 @@ public function getSubmissionsData(Form $form, string $fileFormat, ?File $file =
 		$submissionEntities = array_reverse($submissionEntities);
 
 		$questions = $this->questionMapper->findByForm($form->getId());
-		$defaultTimeZone = date_default_timezone_get();
+		$defaultTimeZone = $this->config->getSystemValueString('default_timezone', 'UTC');
 
 		if (!$this->currentUser) {
 			$userTimezone = $this->config->getUserValue($form->getOwnerId(), 'core', 'timezone', $defaultTimeZone);

diff --git a/tests/Unit/Service/SubmissionServiceTest.php b/tests/Unit/Service/SubmissionServiceTest.php
@@ -579,7 +579,11 @@ private function setUpCsvTest(array $questions, array $submissions, string $csvT
 				return $questionEntities;
 			}));
 
-		date_default_timezone_set('Europe/Berlin');
+		$this->config->expects($this->once())
+			->method('getSystemValueString')
+			->with('default_timezone', 'UTC')
+			->willReturn('Europe/Berlin');
+
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('currentUser', 'core', 'timezone', 'Europe/Berlin')