summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-20 12:30:05 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-20 12:30:05 +0100
commit0da50123c196ca0f342cac44b76f889a6f8a96b9 (patch)
treea5113605fd6de93020b9b39c05a9e10a08279919 /system
parent90726b8c769ea75aec34814ddfa91655d488e6c3 (diff)
Pagination: Add 'use_global_url_suffix' setting
Resolves issue #1887
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Pagination.php12
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;
}