summaryrefslogtreecommitdiff
path: root/searx/webapp.py
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2017-07-19 21:33:44 +0200
committerAdam Tauber <asciimoo@gmail.com>2017-07-20 13:32:20 +0200
commitf2b13a7de071cd68c9aeef7ff3e87ede88e677e8 (patch)
tree5b34d38b74c09ba53d70641b522296253bf42b39 /searx/webapp.py
parent1794f6a4d36cafcc4eb2a64e0145d937bc81bc34 (diff)
[enh] allow default empty values for normal and result proxies
Diffstat (limited to 'searx/webapp.py')
-rw-r--r--searx/webapp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index 1e66590c1..3afdbefd8 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -142,7 +142,7 @@ _category_names = (gettext('files'),
gettext('map'),
gettext('science'))
-outgoing_proxies = settings['outgoing'].get('proxies', None)
+outgoing_proxies = settings['outgoing'].get('proxies') or None
@babel.localeselector
@@ -353,7 +353,7 @@ def render(template_name, override_theme=None, **kwargs):
kwargs['image_proxify'] = image_proxify
- kwargs['proxify'] = proxify if settings.get('result_proxy') else None
+ kwargs['proxify'] = proxify if settings.get('result_proxy', {}).get('url') else None
kwargs['get_result_template'] = get_result_template