From: Markus Törnqvist <mjt@fadconsulting.com>
Date: Tue, 25 Jun 2013 08:36:42 +0000 (+0300)
Subject: Always pass the context through
X-Git-Tag: release-2.1~9^2~1
X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/b5f7065624d3f212ef9e22911478011789cc32b0?ds=inline

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
--- 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):
-        return {}
+        to_return = {}
+
+    context.update(to_return)
+
+    return context
 
 
 register = Library()