X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/52b732386eaabbe2d99e3b13ad680ab06bdc4c47..508b758ebf7d03317c1f1a14ba6006dd83eedd08:/forum/utils/pagination.py

diff --git a/forum/utils/pagination.py b/forum/utils/pagination.py
index fb99244..f607cd0 100644
--- a/forum/utils/pagination.py
+++ b/forum/utils/pagination.py
@@ -210,8 +210,8 @@ def _paginated(request, objects, context):
     def get_page():
         object_list = page_obj.object_list
 
-        if hasattr(object_list, 'lazy'):
-            return object_list.lazy()
+        #if hasattr(object_list, 'lazy'):
+        #    return object_list.lazy()
         return object_list
     paginator.page = get_page()
 
@@ -240,9 +240,9 @@ def _paginated(request, objects, context):
             page_numbers = []
 
             if sort:
-                url_builder = lambda n: mark_safe("%s%s%s=%s&%s=%s" % (base_path, url_joiner, context.SORT, sort, context.PAGE, n))
+                url_builder = lambda n: mark_safe("%s%s%s=%s&%s=%s" % (escape(base_path), url_joiner, context.SORT, sort, context.PAGE, n))
             else:
-                url_builder = lambda n: mark_safe("%s%s%s=%s" % (base_path, url_joiner, context.PAGE, n))
+                url_builder = lambda n: mark_safe("%s%s%s=%s" % (escape(base_path), url_joiner, context.PAGE, n))
 
             if range_start > (context.outside_page_range + 1):
                 page_numbers.append([(n, url_builder(n)) for n in range(1, context.outside_page_range + 1)])