self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-10 00:05:42 +02:00
Code Issues Releases Activity

Desktop: Fixes #10382: Fix default values for plugin settings stored in settings.json not applied (#10383)

Browse Source
This commit is contained in:
Henry Heino
2024-05-02 07:00:12 -07:00
committed by GitHub
parent 85f890e7c5
commit 569b567f21
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/lib/models/Setting.ts
View File

@ -2116,6 +2116,7 @@ class Setting extends BaseModel {
}
// Low-level method to load a setting directly from the database. Should not be used in most cases.
// Does not apply setting default values.
public static async loadOne(key: string): Promise<CacheItem | null> {
if (this.keyStorage(key) === SettingStorage.File) {
let fileSettings = await this.fileHandler.load();
@ -2126,10 +2127,14 @@ class Setting extends BaseModel {
fileSettings = mergeGlobalAndLocalSettings(rootFileSettings, fileSettings);
}
return {
key,
value: fileSettings[key],
};
if (key in fileSettings) {
return {
key,
value: fileSettings[key],
};
} else {
return null;
}
}
// Always check in the database first, including for secure settings,