Always pass the context through

diff --git a/linaro_django_pagination/templatetags/pagination_tags.py b/linaro_django_pagination/templatetags/pagination_tags.py
index 28e2897..15363d8 100644 (file)
--- a/linaro_django_pagination/templatetags/pagination_tags.py
+++ b/linaro_django_pagination/templatetags/pagination_tags.py
@@ -328,7 +328,11 @@ def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
                 to_return['getvars'] = ''
         return to_return
     except (KeyError, AttributeError):
                 to_return['getvars'] = ''
         return to_return
     except (KeyError, AttributeError):

-        return {}
+        to_return = {}
+
+    context.update(to_return)
+
+    return context

 
 
 register = Library()
 
 
 register = Library()