Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration

1 files changed, 8 insertions, 1 deletions

diff --git a/searx/webapp.py b/searx/webapp.py
index e118fee2b..800bde004 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -320,6 +320,8 @@ def render(template_name, override_theme=None, **kwargs):
 
     kwargs['instance_name'] = settings['general']['instance_name']
 
+    kwargs['results_on_new_tab'] = request.preferences.get_value('results_on_new_tab')
+
     kwargs['scripts'] = set()
     for plugin in request.user_plugins:
         for script in plugin.js_dependencies:
@@ -338,7 +340,11 @@ def render(template_name, override_theme=None, **kwargs):
 def pre_request():
     # merge GET, POST vars
     preferences = Preferences(themes, categories.keys(), engines, plugins)
-    preferences.parse_cookies(request.cookies)
+    try:
+        preferences.parse_cookies(request.cookies)
+    except:
+        # TODO throw error message to the user
+        logger.warning('Invalid config')
     request.preferences = preferences
 
     request.form = dict(request.form.items())
@@ -553,6 +559,7 @@ def preferences():
     lang = request.preferences.get_value('language')
     disabled_engines = request.preferences.engines.get_disabled()
     allowed_plugins = request.preferences.plugins.get_enabled()
+    results_on_new_tab = request.preferences.get_value('results_on_new_tab')
 
     # stats for preferences page
     stats = {}