Pagination: Add 'use_global_url_suffix' setting

Resolves issue #1887

1 files changed, 12 insertions, 0 deletions

diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 6c8366435..aa54ec4c1 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -299,6 +299,13 @@ class CI_Pagination {
 	protected $reuse_query_string = FALSE;
 
 	/**
+	 * Use global URL suffix flag
+	 *
+	 * @var	bool
+	 */
+	protected $use_global_url_suffix = FALSE;
+
+	/**
 	 * Data page attribute
 	 *
 	 * @var	string
@@ -373,6 +380,11 @@ class CI_Pagination {
 			$this->page_query_string = TRUE;
 		}
 
+		if ($this->use_global_url_suffix === TRUE)
+		{
+			$this->suffix = $this->CI->config->item('url_suffix');
+		}
+
 		return $this;
 	}