summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-07-15 16:02:49 +0200
committerAndrey Andreev <narf@devilix.net>2015-07-15 16:02:49 +0200
commit31cd44ba605b9fec2d480d0d5d6cde7a381357a6 (patch)
tree371f06909f7d129b27f28fbdd154b7eaf5571b1a
parentc373c07d9003c7d03214a45100199ca333b5963c (diff)
parent361750a8eb48c91d4a741b81bcb5572388742fed (diff)
Merge pull request #3715 from infinit89/patch-1
[ci skip] Fix pagination links with protocol-relative URLs
-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;