don't absolutify if the url already looks absolute (bug 684128)

mozilla · Sep 2, 2011 · 64ca967 · 64ca967
1 parent 1b54fb7
commit 64ca967
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/apps/amo/helpers.py b/apps/amo/helpers.py
@@ -295,7 +295,10 @@ def json(s):
 @register.filter
 def absolutify(url):
     """Takes a URL and prepends the SITE_URL"""
-    return settings.SITE_URL + url
+    if url.startswith('http'):
+        return url
+    else:
+        return settings.SITE_URL + url
 
 
 @register.filter

diff --git a/apps/amo/tests/test_helpers.py b/apps/amo/tests/test_helpers.py
@@ -433,3 +433,9 @@ def test_jinja_trans_monkeypatch():
     render('{% trans come_on=1 %}% (come_on)s{% endtrans %}')
     render('{% trans come_on=1 %}%(come_on){% endtrans %}')
     render('{% trans come_on=1 %}%(come_on)z{% endtrans %}')
+
+
+def test_absolutify():
+    eq_(helpers.absolutify('/woo'), settings.SITE_URL + '/woo')
+    eq_(helpers.absolutify('https://addons.mozilla.org'),
+        'https://addons.mozilla.org')