summaryrefslogtreecommitdiff
path: root/searx/engines/flickr.py
diff options
context:
space:
mode:
authorAlexandre Flament <alex@al-f.net>2016-12-09 23:11:45 +0100
committerGitHub <noreply@github.com>2016-12-09 23:11:45 +0100
commite48f07a367e55bf8aa881902b977bd7ce1cd2bb6 (patch)
tree8b285b2dd483006d08c03b9fec49cba49ff16a87 /searx/engines/flickr.py
parent219f047bf359ce94397241b875639f3aaddb0fe5 (diff)
parentd80fb2c8e8995facb3a25c152c47a93eecf1fee4 (diff)
Merge branch 'master' into searchpy2
Diffstat (limited to 'searx/engines/flickr.py')
-rw-r--r--searx/engines/flickr.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/searx/engines/flickr.py b/searx/engines/flickr.py
index 68d45bc17..5ce1160e9 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': photo['description']['_content'],
+ 'author': photo['ownername'],
'template': 'images.html'})
# return results