From 16bdc0baf4f2b56af000337c4a2fa1e689f1220c Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Fri, 9 Dec 2016 11:44:24 +0100
Subject: [mod] do not escape html content in engines

---
 searx/engines/flickr.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'searx/engines/flickr.py')

diff --git a/searx/engines/flickr.py b/searx/engines/flickr.py
index 68d45bc17..1c3eef789 100644
--- a/searx/engines/flickr.py
+++ b/searx/engines/flickr.py
@@ -77,21 +77,13 @@ def response(resp):
 
         url = build_flickr_url(photo['owner'], photo['id'])
 
-        title = photo['title']
-
-        content = '<span class="photo-author">' +\
-                  photo['ownername'] +\
-                  '</span><br />' +\
-                  '<span class="description">' +\
-                  photo['description']['_content'] +\
-                  '</span>'
-
         # append result
         results.append({'url': url,
-                        'title': title,
+                        'title': photo['title'],
                         'img_src': img_src,
                         'thumbnail_src': thumbnail_src,
-                        'content': content,
+                        'content': content = photo['description']['_content'],
+                        'author': photo['ownername'],
                         'template': 'images.html'})
 
     # return results
-- 
cgit v1.2.3


From fdf63940e8e576aee9fe5e03337d39e771f24514 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Fri, 9 Dec 2016 19:10:57 +0100
Subject: [fix] tests ++ flickr error

---
 searx/engines/flickr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/engines/flickr.py')

diff --git a/searx/engines/flickr.py b/searx/engines/flickr.py
index 1c3eef789..5ce1160e9 100644
--- a/searx/engines/flickr.py
+++ b/searx/engines/flickr.py
@@ -82,7 +82,7 @@ def response(resp):
                         'title': photo['title'],
                         'img_src': img_src,
                         'thumbnail_src': thumbnail_src,
-                        'content': content = photo['description']['_content'],
+                        'content': photo['description']['_content'],
                         'author': photo['ownername'],
                         'template': 'images.html'})
 
-- 
cgit v1.2.3