summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-21 18:30:02 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-21 18:30:02 +0200
commitf5278167603056e612b9228936d68d1ee30388ae (patch)
treecc35ae212bbdbfb5422490a465140ad7b5ad389e
parent17479a7ffb3d02b25cd97937e051b683524c61bd (diff)
parentc9cda5e8a6feb8447243c0bd38e57a219d7d478e (diff)
downloadIshtar-f5278167603056e612b9228936d68d1ee30388ae.tar.bz2
Ishtar-f5278167603056e612b9228936d68d1ee30388ae.zip
Merge branch 'master' into master-gis
-rw-r--r--ishtar_common/templatetags/window_field.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py
index 73e944c0f..2a58d844a 100644
--- a/ishtar_common/templatetags/window_field.py
+++ b/ishtar_common/templatetags/window_field.py
@@ -24,7 +24,7 @@ def field_url(caption, link, link_name='', li=False):
link = link.strip()
if not link:
return u''
- if not link.startswith('http://') or not link.startswith('https://'):
+ if not link.startswith('http://') and not link.startswith('https://'):
link = 'http://' + link
return {'caption': caption, 'link': link, "link_name": link_name, 'li': li}