Merge branch 'release/1.4.6'

getgrav · Feb 5, 2024 · 21b58e0 · 21b58e0
2 parents ed158b0 + 19be176
commit 21b58e0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.4.6
+## 02/05/2024
+
+1. [](#bugfix)
+   * Reverted fixes for an error in pagination URLs with system level Absolute URLs enabled. Will investigate [#60](https://github.com/getgrav/grav-plugin-pagination/issues/60) further
+
 # v1.4.5
 ## 02/03/2024
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Pagination
 slug: pagination
 type: plugin
-version: 1.4.5
+version: 1.4.6
 description: "**Pagination** is a very useful plugin to help navigate a large collection of pages, such as for a **blog**."
 icon: list-ol
 author:

diff --git a/templates/partials/pagination.html.twig b/templates/partials/pagination.html.twig
@@ -5,7 +5,7 @@
 
 <ul class="pagination">
     {% if pagination.hasPrev %}
-        {% set url =  (base_url ~ pagination.params ~ pagination.prevUrl|replace({'//':'/'})) %}
+        {% set url =  (base_url ~ pagination.params ~ pagination.prevUrl)|replace({'//':'/'}) %}
         <li><a rel="prev" href="{{ url }}">&laquo;</a></li>
     {% else %}
         <li><span>&laquo;</span></li>
@@ -16,15 +16,15 @@
         {% if paginate.isCurrent %}
             <li><span class="active">{{ paginate.number }}</span></li>
         {% elseif paginate.isInDelta %}
-            {% set url = (base_url ~ pagination.params ~ paginate.url|replace({'//':'/'})) %}
+            {% set url = (base_url ~ pagination.params ~ paginate.url)|replace({'//':'/'}) %}
             <li><a href="{{ url }}">{{ paginate.number }}</a></li>
         {% elseif paginate.isDeltaBorder %}
             <li class="gap"><span>&hellip;</span></li>
         {% endif %}
 
     {% endfor %}
     {% if pagination.hasNext %}
-        {% set url = (base_url ~ pagination.params ~ pagination.nextUrl|replace({'//':'/'})) %}
+        {% set url = (base_url ~ pagination.params ~ pagination.nextUrl)|replace({'//':'/'}) %}
         <li><a rel="next" href="{{ url }}">&raquo;</a></li>
     {% else %}
         <li><span>&raquo;</span></li>