Merge remote-tracking branch 'upstream/develop' into develop

1 files changed, 13 insertions, 4 deletions

diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 1081fbec7..d63f61df6 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
@@ -333,7 +340,7 @@ class CI_Pagination {
 		}
 
 		$this->initialize($params);
-		log_message('debug', 'Pagination Class Initialized');
+		log_message('info', 'Pagination Class Initialized');
 	}
 
 	// --------------------------------------------------------------------
@@ -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;
 	}
 
@@ -682,6 +694,3 @@ class CI_Pagination {
 	}
 
 }
-
-/* End of file Pagination.php */
-/* Location: ./system/libraries/Pagination.php */
\ No newline at end of file