From 572d7d3cbc46dd1b13d697b7634c51ed35738e14 Mon Sep 17 00:00:00 2001
From: Dan Head <me@danielhead.com>
Date: Sun, 20 Jan 2019 16:56:15 +0000
Subject: [PATCH] Fix pagination previous and next URLs

---
 theme/index.php               | 2 +-
 theme/partials/pagination.php | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/theme/index.php b/theme/index.php
index 57a8d8d..b937b6d 100644
--- a/theme/index.php
+++ b/theme/index.php
@@ -7,7 +7,7 @@
   <section class="page__article<?php echo ($index === 1 ? ' is-first' : '') ?>">
     <article class="article">
       <div class="article__date">
-        <svg class="icon">
+        <svg class="icon icon--extra-small">
           <use xlink:href="#icon-calendar"></use>
         </svg>
         <span class="article__date-text">
diff --git a/theme/partials/pagination.php b/theme/partials/pagination.php
index 18f868b..7f45bba 100644
--- a/theme/partials/pagination.php
+++ b/theme/partials/pagination.php
@@ -1,5 +1,7 @@
 <?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');
 $total = $wp_query->max_num_pages;
 $links = paginate_links(array(
@@ -11,7 +13,7 @@ $links = paginate_links(array(
 
 function get_previous_url($base_url, $page) {
   $qs = $_SERVER['QUERY_STRING'];
-  $url = $base_url . ($page - 1);
+  $url = $base_url . 'page/' . ($page - 1);
   if ($qs) {
     $url .= '/?' . $qs;
   }
@@ -20,7 +22,7 @@ function get_previous_url($base_url, $page) {
 
 function get_next_url($base_url, $page) {
   $qs = $_SERVER['QUERY_STRING'];
-  $url = $base_url;
+  $url = $base_url . 'page/';
   if ($page === 0) {
     $url .= '2';
   } else {
@@ -56,7 +58,6 @@ if (count($links) > 1) :
     <ul class="pagination__list">
       <?php foreach($links as $link) { ?>
         <li class="pagination__item">
-          <?php echo $key ?>
           <?php echo format_link($link) ?>
         </li>
       <?php } ?>