summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2007-05-02 13:34:08 +0200
committerDerek Allard <derek.allard@ellislab.com>2007-05-02 13:34:08 +0200
commitbbc5ec2a660c960873f7c41437859fa1d82703d6 (patch)
tree7a4bb333453e1e1a9624dec5a50e58c5e6cf7f48 /system/libraries
parent31d363b39fe8ec09e1af3b4441f9bd5844bf8224 (diff)
$this->base_url = preg_replace("/(.+?)\/*$/", "\\1/", $this->base_url);
changed to $this->base_url = rtrim($this->base_url, '/') .'/';
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Pagination.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 8ea0dab19..c5c718dee 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -146,8 +146,8 @@ class CI_Pagination {
$end = (($this->cur_page + $this->num_links) < $num_pages) ? $this->cur_page + $this->num_links : $num_pages;
// Add a trailing slash to the base URL if needed
- $this->base_url = preg_replace("/(.+?)\/*$/", "\\1/", $this->base_url);
-
+ $this->base_url = rtrim($this->base_url, '/') .'/';
+
// And here we go...
$output = '';