From 1057788675c5500f191d47eb751078545d488c0a Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Thu, 31 May 2012 14:54:45 -0700 Subject: [PATCH 1/2] URL prefix and suffix were not being applied to the link for page 1 --- system/libraries/Pagination.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 58f86fa176e..9926c3e9400 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -256,8 +256,7 @@ public function create_links() } else { - $n = ($n == '') ? '' : $this->prefix.$n.$this->suffix; - + $n = $this->prefix.$i.$this->suffix; $output .= $this->num_tag_open.'anchor_class.'href="'.$this->base_url.$n.'">'.$loop.''.$this->num_tag_close; } } From 121593e007bd5276c920076c75ca5aa472f15b26 Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Thu, 31 May 2012 15:36:52 -0700 Subject: [PATCH 2/2] Typo --- user_guide_src/source/general/styleguide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst index 925954c039e..9ffd9b3df9c 100644 --- a/user_guide_src/source/general/styleguide.rst +++ b/user_guide_src/source/general/styleguide.rst @@ -52,7 +52,7 @@ whether introduced by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages. For this reason, all PHP files should **OMIT** the closing PHP tag, and instead use a comment block to mark the end of file and -it's location relative to the application root. This allows you to still +its location relative to the application root. This allows you to still identify a file as being complete and not truncated. **INCORRECT**::