summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel González <infinit89@gmail.com>2015-03-30 05:00:21 +0200
committerMiguel González <infinit89@gmail.com>2015-03-30 05:00:21 +0200
commit361750a8eb48c91d4a741b81bcb5572388742fed (patch)
tree25ee4158e97c01645c6d8180672e129c19f217f7
parent138d0f54fc92ec57f48865850f84594c59b50797 (diff)
Fixes pagination with relative URL
When base_url is a URL based on protocol, like "//www.google.com" the double slash regex kills the first "//".
-rw-r--r--system/libraries/Pagination.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index d63f61df6..76437f4a5 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -644,7 +644,7 @@ class CI_Pagination {
// Kill double slashes. Note: Sometimes we can end up with a double slash
// in the penultimate link so we'll kill all double slashes.
- $output = preg_replace('#([^:])//+#', '\\1/', $output);
+ $output = preg_replace('#([^:"])//+#', '\\1/', $output);
// Add the wrapper HTML if exists
return $this->full_tag_open.$output.$this->full_tag_close;