Merge branch 'main' into fix/activities-again

dartcafe · web-flow · commit bcd951557d8d · 2025-09-01T18:40:01.000+02:00
Signed-off-by: René Gieling &lt;github@dartcafe.de&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 ## [unpublished]
 ### Fixed
  - Fixed some activity bugs
+ - Fixed nullish user settings
 
 ## [8.4.2] - 2025-08-31
 ### Fixed
diff --git a/lib/Db/Preferences.php b/lib/Db/Preferences.php
@@ -64,7 +64,7 @@ public function setUserSettings(array $settings): void {
 	}
 
 	public function getUserSettings(): array {
-		return json_decode($this->getPreferences() ?? '', true);
+		return json_decode($this->getPreferences() ?? '', true) ?? self::DEFAULT_SETTINGS;
 	}
 
 	public function getCheckCalendarsHoursBefore(): int {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function setUserSettings(array $settings): void {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public function getUserSettings(): array {`
`67`		`- return json_decode($this->getPreferences() ?? '', true);`
	`67`	`+ return json_decode($this->getPreferences() ?? '', true) ?? self::DEFAULT_SETTINGS;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public function getCheckCalendarsHoursBefore(): int {`