From 0da50123c196ca0f342cac44b76f889a6f8a96b9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 20 Jan 2015 13:30:05 +0200
Subject: Pagination: Add 'use_global_url_suffix' setting

Resolves issue #1887
---
 system/libraries/Pagination.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'system/libraries/Pagination.php')

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
@@ -298,6 +298,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
 	 *
@@ -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;
 	}
 
-- 
cgit v1.2.3-24-g4f1b