Merge pull request #2349 from dalf/fix-settings-loader

[fix] settings_loader: don't crash when a key exists only in the user settings

searx/settings_loader.py

@@ -57,7 +57,10 @@ 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:
                 update_dict(default_settings[k], v)
+            else:
+                default_settings[k] = v
 
     # parse the engines
     remove_engines = None

tests/unit/settings/user_settings_simple.yml

@@ -4,3 +4,6 @@ server:
     bind_address: "0.0.0.0"
     default_http_headers:
         Custom-Header: Custom-Value
+result_proxy:
+   url : https://localhost/morty
+   key : "$ecretKey"