ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2728 from return42/fix-loader 

[fix] settings_loader.py - use update_dict only for mapping types
This commit is contained in:
Noémi Ványi 2021-04-05 21:32:41 +02:00 committed by GitHub
parent b40af000f3 9c10b15096
commit a477a3a687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
searx/settings_loader.py
View File

@ -57,7 +57,7 @@ def update_settings(default_settings, user_settings):
# merge everything except the engines # merge everything except the engines
for k, v in user_settings.items(): for k, v in user_settings.items():
if k not in ('use_default_settings', 'engines'): if k not in ('use_default_settings', 'engines'):
if k in default_settings: if k in default_settings and isinstance(v, Mapping):
update_dict(default_settings[k], v) update_dict(default_settings[k], v)
else: else:
default_settings[k] = v default_settings[k] = v