Prevents questions on which the slug comes out empty to enter a redirect loop.

[osqa.git] / forum / views / readers.py

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 0d282b8c5000d25a0cd779addce27a3f69027352..6a490876506c59acaf03e944444d7a6acc3a7511 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -277,7 +277,7 @@ def answer_redirect(request, answer):
         answer.question.get_absolute_url(), _('page'), page, answer.id))
 
 @decorators.render("question.html", 'questions')
-def question(request, id, slug=None, answer=None):
+def question(request, id, slug='', answer=None):
     try:
         question = Question.objects.get(id=id)
     except:
@@ -305,7 +305,7 @@ def question(request, id, slug=None, answer=None):
 
         return answer_redirect(request, answer)
 
-    if (not slug) or (slug != urlquote(slugify(question.title))):
+    if settings.FORCE_SINGLE_URL and (slug != slugify(question.title)):
         return HttpResponsePermanentRedirect(question.get_absolute_url())
 
     if request.POST: