dan/windycoys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pagination previous and next URLs

Browse Source
This commit is contained in:
Dan Head
2019-01-20 16:56:15 +00:00
parent 84882ce8c0
commit 572d7d3cbc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
theme/index.php
View File

@@ -7,7 +7,7 @@
<section class="page__article<?php echo ($index === 1 ? ' is-first' : '') ?>"> <section class="page__article<?php echo ($index === 1 ? ' is-first' : '') ?>">
<article class="article"> <article class="article">
<div class="article__date"> <div class="article__date">
<svg class="icon"> <svg class="icon icon--extra-small">
<use xlink:href="#icon-calendar"></use> <use xlink:href="#icon-calendar"></use>
</svg> </svg>
<span class="article__date-text"> <span class="article__date-text">

9
theme/partials/pagination.php
View File

@@ -1,5 +1,7 @@
<?php <?php
$base_url = get_site_url().'/page/'; global $wp;
$url = home_url($wp->request);
$base_url = substr($url, 0, strpos($url, "page/"));
$current = get_query_var('paged'); $current = get_query_var('paged');
$total = $wp_query->max_num_pages; $total = $wp_query->max_num_pages;
$links = paginate_links(array( $links = paginate_links(array(
@@ -11,7 +13,7 @@ $links = paginate_links(array(
function get_previous_url($base_url, $page) { function get_previous_url($base_url, $page) {
$qs = $_SERVER['QUERY_STRING']; $qs = $_SERVER['QUERY_STRING'];
$url = $base_url . ($page - 1); $url = $base_url . 'page/' . ($page - 1);
if ($qs) { if ($qs) {
$url .= '/?' . $qs; $url .= '/?' . $qs;
} }
@@ -20,7 +22,7 @@ function get_previous_url($base_url, $page) {
function get_next_url($base_url, $page) { function get_next_url($base_url, $page) {
$qs = $_SERVER['QUERY_STRING']; $qs = $_SERVER['QUERY_STRING'];
$url = $base_url; $url = $base_url . 'page/';
if ($page === 0) { if ($page === 0) {
$url .= '2'; $url .= '2';
} else { } else {
@@ -56,7 +58,6 @@ if (count($links) > 1) :
<ul class="pagination__list"> <ul class="pagination__list">
<?php foreach($links as $link) { ?> <?php foreach($links as $link) { ?>
<li class="pagination__item"> <li class="pagination__item">
<?php echo $key ?>
<?php echo format_link($link) ?> <?php echo format_link($link) ?>
</li> </li>
<?php } ?> <?php } ?>