From: Zygmunt Krynicki <zkrynicki@gmail.com>
Date: Wed, 14 May 2014 12:29:22 +0000 (+0200)
Subject: Merge pull request #25 from mktums/patch-1
X-Git-Tag: release-2.1~2
X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/2b589e1bb9345689fba122c55fa2eeb900b5bb89?hp=664fcc7c0f5ec9a54c15707a20d5da24b03f9bf9

Merge pull request #25 from mktums/patch-1

I'm terribly sorry… (fix for #24)
---

diff --git a/linaro_django_pagination/templates/pagination/pagination.html b/linaro_django_pagination/templates/pagination/pagination.html
index 95b85ca..ea01b61 100644
--- a/linaro_django_pagination/templates/pagination/pagination.html
+++ b/linaro_django_pagination/templates/pagination/pagination.html
@@ -4,7 +4,7 @@
   {% block previouslink %}
   {% if page_obj.has_previous %}
   {% if disable_link_for_first_page and page_obj.previous_page_number == 1 %}
-  <a href="{{ request.path }}{{ getvars }}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>
+  <a href="{{ request.path }}{% if getvars %}?{{ getvars|slice:"1:" }}{% endif %}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>
   {% else %}
   <a href="?page{{ page_suffix }}={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>
   {% endif %}
@@ -22,7 +22,7 @@
   <span class="current page">{{ page }}</span>
   {% else %}
   {% if disable_link_for_first_page and page == 1 %}
-  <a href="{{ request.path }}{{ getvars }}" class="page">{{ page }}</a>
+  <a href="{{ request.path }}{% if getvars %}?{{ getvars|slice:"1:" }}{% endif %}" class="page">{{ page }}</a>
   {% else %}
   <a href="?page{{ page_suffix }}={{ page }}{{ getvars }}" class="page">{{ page }}</a>
   {% endif %}