Previous feature addition commit introduced errors; rolling back to previous revision...

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 8e641bf7a1fbc59a44e109c1632284b9a9d44329..e0929220b6b0dfa5d9f3a1967d71b0b18ba42b45 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -167,7 +167,7 @@ def question_list(request, initial,
         if req_params:
             req_params = '&' + req_params
 
         if req_params:
             req_params = '&' + req_params
 

-        feed_url = mark_safe(request.path + "?type=rss" + req_params)
+        feed_url = mark_safe(escape(request.path + "?type=rss" + req_params))

 
     return pagination.paginated(request, ('questions', paginator_context or QuestionListPaginatorContext()), {
     "questions" : questions.distinct(),
 
     return pagination.paginated(request, ('questions', paginator_context or QuestionListPaginatorContext()), {
     "questions" : questions.distinct(),


@@ -267,7 +267,7 @@ def answer_redirect(request, answer):
     else:
         raise Http404()
 
     else:
         raise Http404()
 

-    count = answer.question.answers.filter(Q(marked=True) | filter).count()
+    count = answer.question.answers.filter(Q(marked=True) | filter).exclude(state_string="(deleted)").count()

     pagesize = pc.pagesize(request)
 
     page = count / pagesize
     pagesize = pc.pagesize(request)
 
     page = count / pagesize