From da75c6917215292fa419e3a1878156b89731245c Mon Sep 17 00:00:00 2001
From: Brad MacDonald <brad@pixeldesigns.ca>
Date: Thu, 21 Mar 2019 20:19:03 -0600
Subject: [PATCH 1/3] Fix foundationpress_pagination() invalid HTML markup, and
 match markup to Foundation's docs on pagination.

---
 library/foundation.php | 42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/library/foundation.php b/library/foundation.php
index 4e0e57c79..6d59f7876 100644
--- a/library/foundation.php
+++ b/library/foundation.php
@@ -28,12 +28,42 @@ function foundationpress_pagination() {
 			)
 		);
 
-		$paginate_links = str_replace( "<ul class='page-numbers'>", "<ul class='pagination text-center' role='navigation' aria-label='Pagination'>", $paginate_links );
-		$paginate_links = str_replace( '<li><span class="page-numbers dots">', "<li><a href='#'>", $paginate_links );
-		$paginate_links = str_replace( '</span>', '</a>', $paginate_links );
-		$paginate_links = str_replace( "<li><span class='page-numbers current'>", "<li class='current'>", $paginate_links );
-		$paginate_links = str_replace( "<li><a href='#'>&hellip;</a></li>", "<li><span class='dots'>&hellip;</span></li>", $paginate_links );
-		$paginate_links = preg_replace( '/\s*page-numbers/', '', $paginate_links );
+		// Match patterns for preg_replace
+		$preg_find = [
+			'/\s*page-numbers\s*/', // Captures string 'page-numbers' and any whitespace before and after
+			"/\s*class=''/", // Captures any empty class attributes
+			'/<li><a class="prev" href="(\S+)">/', // '(\S+)' Captures href value for backreference
+			'/<li><a class="next" href="(\S+)">/', // '(\S+)' Captures href value for backreference
+			"/<li><span aria-current='page' class='current'>(\d+)<\/span><\/li>/", // '(\d+)' Captures page number for backreference
+			"/<li><a href='(\S+)'>(\d+)<\/a><\/li>/", // '(\S+)' Captures href value for backreference, (\d+)' Captures page number for backreference
+		];
+
+		// preg_replace replacements
+		$preg_replace = [
+			'',
+			'',
+			'<li class="pagination-previous"><a href="$1" aria-label="Previous page">', // '$1' Outputs backreference href value
+			'<li class="pagination-next"><a href="$1" aria-label="Next page">', // '$1' Outputs backreference href value
+			'<li class="current" aria-current="page"><span class="show-for-sr">You\'re on page </span>$1</li>', // '$1' Outputs backreference page number
+			'<li><a href="$1" aria-label="Page $2">$2</a>', // '$1' Ouputs backreference href, '$2' outputs backreference page number
+		];
+
+		// Match patterns for str_replace
+		$str_find = [
+			"<ul>",
+			'<li><span class="dots">&hellip;</span></li>',
+		];
+
+		// str_replace replacements
+		$str_replace = [
+			'<ul class="pagination text-center">',
+			'<li class="ellipsis" aria-hidden="true"></li>',
+		];
+
+		$paginate_links = preg_replace( $preg_find, $preg_replace, $paginate_links );
+		$paginate_links = str_replace( $str_find, $str_replace, $paginate_links );
+
+		$paginate_links = '<nav aria-label="Pagination">' . $paginate_links . '</nav>';
 
 		// Display the pagination if more than one page is found.
 		if ( $paginate_links ) {

From a9686b14db32aff9ed0c7612d484b1c6a16940a4 Mon Sep 17 00:00:00 2001
From: Brad MacDonald <brad@pixeldesigns.ca>
Date: Thu, 21 Mar 2019 20:21:57 -0600
Subject: [PATCH 2/3] Do not output arrows in prev_text and next_text.

---
 library/foundation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/foundation.php b/library/foundation.php
index 6d59f7876..393d71fe7 100644
--- a/library/foundation.php
+++ b/library/foundation.php
@@ -22,8 +22,8 @@ function foundationpress_pagination() {
 				'total'     => $wp_query->max_num_pages,
 				'mid_size'  => 5,
 				'prev_next' => true,
-				'prev_text' => __( '&laquo;', 'foundationpress' ),
-				'next_text' => __( '&raquo;', 'foundationpress' ),
+				'prev_text' => '',
+				'next_text' => '',
 				'type'      => 'list',
 			)
 		);

From f07d462880b41045fa92e3b2eaacb51c56227da5 Mon Sep 17 00:00:00 2001
From: Brad MacDonald <brad@pixeldesigns.ca>
Date: Thu, 11 Apr 2019 12:13:42 -0600
Subject: [PATCH 3/3] Fix faulty logic within pagination output.

---
 library/foundation.php | 79 +++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/library/foundation.php b/library/foundation.php
index 393d71fe7..902cfc7a5 100644
--- a/library/foundation.php
+++ b/library/foundation.php
@@ -28,45 +28,46 @@ function foundationpress_pagination() {
 			)
 		);
 
-		// Match patterns for preg_replace
-		$preg_find = [
-			'/\s*page-numbers\s*/', // Captures string 'page-numbers' and any whitespace before and after
-			"/\s*class=''/", // Captures any empty class attributes
-			'/<li><a class="prev" href="(\S+)">/', // '(\S+)' Captures href value for backreference
-			'/<li><a class="next" href="(\S+)">/', // '(\S+)' Captures href value for backreference
-			"/<li><span aria-current='page' class='current'>(\d+)<\/span><\/li>/", // '(\d+)' Captures page number for backreference
-			"/<li><a href='(\S+)'>(\d+)<\/a><\/li>/", // '(\S+)' Captures href value for backreference, (\d+)' Captures page number for backreference
-		];
-
-		// preg_replace replacements
-		$preg_replace = [
-			'',
-			'',
-			'<li class="pagination-previous"><a href="$1" aria-label="Previous page">', // '$1' Outputs backreference href value
-			'<li class="pagination-next"><a href="$1" aria-label="Next page">', // '$1' Outputs backreference href value
-			'<li class="current" aria-current="page"><span class="show-for-sr">You\'re on page </span>$1</li>', // '$1' Outputs backreference page number
-			'<li><a href="$1" aria-label="Page $2">$2</a>', // '$1' Ouputs backreference href, '$2' outputs backreference page number
-		];
-
-		// Match patterns for str_replace
-		$str_find = [
-			"<ul>",
-			'<li><span class="dots">&hellip;</span></li>',
-		];
-
-		// str_replace replacements
-		$str_replace = [
-			'<ul class="pagination text-center">',
-			'<li class="ellipsis" aria-hidden="true"></li>',
-		];
-
-		$paginate_links = preg_replace( $preg_find, $preg_replace, $paginate_links );
-		$paginate_links = str_replace( $str_find, $str_replace, $paginate_links );
-
-		$paginate_links = '<nav aria-label="Pagination">' . $paginate_links . '</nav>';
-
-		// Display the pagination if more than one page is found.
-		if ( $paginate_links ) {
+        // Display the pagination if more than one page is found.
+        if ( $paginate_links ) {
+
+            // Match patterns for preg_replace
+            $preg_find = [
+                '/\s*page-numbers\s*/', // Captures string 'page-numbers' and any whitespace before and after
+                "/\s*class=''/", // Captures any empty class attributes
+                '/<li><a class="prev" href="(\S+)">/', // '(\S+)' Captures href value for backreference
+                '/<li><a class="next" href="(\S+)">/', // '(\S+)' Captures href value for backreference
+                "/<li><span aria-current='page' class='current'>(\d+)<\/span><\/li>/", // '(\d+)' Captures page number for backreference
+                "/<li><a href='(\S+)'>(\d+)<\/a><\/li>/", // '(\S+)' Captures href value for backreference, (\d+)' Captures page number for backreference
+            ];
+
+            // preg_replace replacements
+            $preg_replace = [
+                '',
+                '',
+                '<li class="pagination-previous"><a href="$1" aria-label="Previous page">', // '$1' Outputs backreference href value
+                '<li class="pagination-next"><a href="$1" aria-label="Next page">', // '$1' Outputs backreference href value
+                '<li class="current" aria-current="page"><span class="show-for-sr">You\'re on page </span>$1</li>', // '$1' Outputs backreference page number
+                '<li><a href="$1" aria-label="Page $2">$2</a>', // '$1' Ouputs backreference href, '$2' outputs backreference page number
+            ];
+
+            // Match patterns for str_replace
+            $str_find = [
+                "<ul>",
+                '<li><span class="dots">&hellip;</span></li>',
+            ];
+
+            // str_replace replacements
+            $str_replace = [
+                '<ul class="pagination text-center">',
+                '<li class="ellipsis" aria-hidden="true"></li>',
+            ];
+
+            $paginate_links = preg_replace( $preg_find, $preg_replace, $paginate_links );
+            $paginate_links = str_replace( $str_find, $str_replace, $paginate_links );
+
+            $paginate_links = '<nav aria-label="Pagination">' . $paginate_links . '</nav>';
+
 			echo $paginate_links;
 		}
 	}