Skip to content

Return default settings in case of empty user settings #4263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dartcafe merged 2 commits into from
Sep 1, 2025
Merged

Return default settings in case of empty user settings #4263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51c6bb8
return default settings in case of empty user settings
dartcafe Sep 1, 2025
a3cf93d
changelog
dartcafe Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
# Changelog
All notable changes to this project will be documented in this file.

## [unpublished]
### Fixed
- Fixed nullish user settings

## [8.4.2] - 2025-08-31
### Fixed
- Better handling of subscribed calendars for calendar check
Expand Down
2 changes: 1 addition & 1 deletion lib/Db/Preferences.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down