searx

commit: bc81eda64bccbdb24c5f482563cac7ba88ef1027
parent: 308613e586108fd7b713fc2a14f8200a0a781105
Author: Adam Tauber <adam.tauber@balabit.com>
Date:   Wed,  2 Mar 2016 11:51:11 +0100

[fix] opensearch image issue - closes #507

Diffstat:
M
searx/templates/courgette/opensearch.xml
2
+-
M
searx/templates/default/opensearch.xml
2
+-
M
searx/templates/oscar/opensearch.xml
2
+-
M
searx/webapp.py
3
++-

4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/searx/templates/courgette/opensearch.xml b/searx/templates/courgette/opensearch.xml
@@ -3,7 +3,7 @@
   <ShortName>{{ instance_name }}</ShortName>
   <Description>a privacy-respecting, hackable metasearch engine</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
+  <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
     <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
diff --git a/searx/templates/default/opensearch.xml b/searx/templates/default/opensearch.xml
@@ -3,7 +3,7 @@
   <ShortName>{{ instance_name }}</ShortName>
   <Description>a privacy-respecting, hackable metasearch engine</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
+  <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
     <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
diff --git a/searx/templates/oscar/opensearch.xml b/searx/templates/oscar/opensearch.xml
@@ -3,7 +3,7 @@
   <ShortName>{{ instance_name }}</ShortName>
   <Description>a privacy-respecting, hackable metasearch engine</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
+  <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
     <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
diff --git a/searx/webapp.py b/searx/webapp.py
@@ -749,7 +749,8 @@ def opensearch():
 
     ret = render('opensearch.xml',
                  opensearch_method=method,
-                 host=get_base_url())
+                 host=get_base_url(),
+                 urljoin=urljoin)
 
     resp = Response(response=ret,
                     status=200,