diff options
author | Wojciech Polak <polak@gnu.org> | 2013-04-18 18:01:38 +0200 |
---|---|---|
committer | Wojciech Polak <polak@gnu.org> | 2013-04-18 18:01:38 +0200 |
commit | 814533bed4e6b8e6e274f6d8c2cf21ec33ba2cd1 (patch) | |
tree | fcc823796211a7672445931b84d3181a05ebf355 | |
parent | 73eb07dbd4fe124cad62335eabcbe748fe9052e5 (diff) | |
download | glifestream-814533bed4e6b8e6e274f6d8c2cf21ec33ba2cd1.tar.gz glifestream-814533bed4e6b8e6e274f6d8c2cf21ec33ba2cd1.tar.bz2 |
Bugfix
-rw-r--r-- | stream/views.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stream/views.py b/stream/views.py index 78c5569..a08e09b 100644 --- a/stream/views.py +++ b/stream/views.py | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | import time | 16 | import time |
17 | import datetime | 17 | import datetime |
18 | from urlparse import urljoin | ||
18 | from django.conf import settings | 19 | from django.conf import settings |
19 | from django.core import urlresolvers | 20 | from django.core import urlresolvers |
20 | from django.http import HttpResponse | 21 | from django.http import HttpResponse |
@@ -329,7 +330,7 @@ def index(request, **args): | |||
329 | gls_link = entries[0].gls_link | 330 | gls_link = entries[0].gls_link |
330 | if gls_link != request.path: | 331 | if gls_link != request.path: |
331 | return HttpResponsePermanentRedirect(gls_link) | 332 | return HttpResponsePermanentRedirect(gls_link) |
332 | page['canonical_link'] = '%s%s' % (settings.BASE_URL, gls_link) | 333 | page['canonical_link'] = urljoin(settings.BASE_URL, gls_link) |
333 | else: | 334 | else: |
334 | raise Http404 | 335 | raise Http404 |
335 | 336 | ||