X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/24da082f86cbb6dae0d55f66c42e4e2c55ac66d1..7eca93637b2f696dcc140d36e44d5f4810346e2c:/forum/utils/pagination.py

diff --git a/forum/utils/pagination.py b/forum/utils/pagination.py
index f607cd0..46c1e89 100644
--- a/forum/utils/pagination.py
+++ b/forum/utils/pagination.py
@@ -3,6 +3,7 @@ from django.utils.datastructures import SortedDict
 from django import template
 from django.core.paginator import Paginator, EmptyPage
 from django.utils.translation import ugettext as _
+from django.utils.html import escape
 from django.http import Http404
 from django.utils.http import urlquote
 from django.utils.safestring import mark_safe
@@ -15,7 +16,7 @@ def generate_uri(querydict, exclude=None):
 
     for k, l in querydict.iterlists():
         if (not exclude) or (not k in exclude):
-            all += ["%s=%s" % (k, urlquote(strip_tags(v))) for v in l]
+            all += ["%s=%s" % (k, escape(strip_tags(v))) for v in l]
         
     return "&".join(all)
 
@@ -33,7 +34,10 @@ class SimpleSort(SortBase):
         return isinstance(self.order_by, (list, tuple)) and self.order_by or [self.order_by]
 
     def apply(self, objects):
-        return objects.order_by(*self._get_order_by())
+        if self.order_by:
+            return objects.order_by(*self._get_order_by())
+
+        return objects
 
 class PaginatorContext(object):
     visible_page_range = 5