From b5f7065624d3f212ef9e22911478011789cc32b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Markus=20T=C3=B6rnqvist?= <mjt@fadconsulting.com>
Date: Tue, 25 Jun 2013 11:36:42 +0300
Subject: [PATCH 1/1] Always pass the context through

---
 linaro_django_pagination/templatetags/pagination_tags.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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()
-- 
2.20.1