From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Sat, 17 Apr 2010 15:55:49 +0000 (+0000)
Subject: make the redirects 301 instead of 302
X-Git-Tag: live~1026
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/2b83a259433a2aed8a2422b5ac327979f5f059e7

make the redirects 301 instead of 302

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@48 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 5f58344..2e2c002 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -4,7 +4,7 @@ import logging
 from urllib import unquote
 from django.conf import settings as django_settings
 from django.shortcuts import render_to_response, get_object_or_404
-from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404
+from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404, HttpResponsePermanentRedirect
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template import RequestContext
 from django import template
@@ -214,16 +214,12 @@ def question(request, id, slug):
     except:
         question = match_question_slug(slug)
         if question is not None:
-            return HttpResponseRedirect(question.get_absolute_url())
+            return HttpResponsePermanentRedirect(question.get_absolute_url())
         else:
             raise Http404()
 
     if slug != urlquote(slugify(question.title)):
-        match = match_question_slug(slug)
-        if match is not None:
-            return HttpResponseRedirect(match.get_absolute_url())    
-
-        return HttpResponseRedirect(question.get_absolute_url())
+        return HttpResponsePermanentRedirect(question.get_absolute_url())
 
     page = int(request.GET.get('page', 1))
     view_id, order_by = get_answer_sort_order(request)