diff options
| author | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
|---|---|---|
| committer | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
| commit | f5311f105f6e708d89d9c92c4104dd911cf8be26 (patch) | |
| tree | 271a431c9464250d15a880ede0b17cfb2d111e7f /system/libraries/Pagination.php | |
| parent | 3e1286b00d0bdd37e649fdb706cd7dfddc25447d (diff) | |
| parent | 4b9fec6797db2aea3af8ca4080be73e2ff421080 (diff) | |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Pagination.php')
| -rw-r--r-- | system/libraries/Pagination.php | 2 |
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; |