summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoémi Ványi <kvch@users.noreply.github.com>2021-04-05 21:32:41 +0200
committerGitHub <noreply@github.com>2021-04-05 21:32:41 +0200
commita477a3a687bb0e61abb2b3ba890dad82c06b5521 (patch)
treee619df2129c86f5228e85c8b94a3536c579f6492
parentb40af000f38bac645c911b2d140f0e551c8c5da1 (diff)
parent9c10b150963babb7f0b52081693a42b2e61eede9 (diff)
Merge pull request #2728 from return42/fix-loader
[fix] settings_loader.py - use update_dict only for mapping types
-rw-r--r--searx/settings_loader.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/searx/settings_loader.py b/searx/settings_loader.py
index e7126aa89..cfdeb4d91 100644
--- a/searx/settings_loader.py
+++ b/searx/settings_loader.py
@@ -57,7 +57,7 @@ def update_settings(default_settings, user_settings):
# merge everything except the engines
for k, v in user_settings.items():
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)
else:
default_settings[k] = v