Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Manually apply a fix submitted via PR #2012, #2016

  • Loading branch information...
commit 2b241399a7b1978ca7992e0a0162599408fabb9b 1 parent 7ade8b7
@narfbg narfbg authored
Showing with 8 additions and 6 deletions.
  1. +8 −6 system/libraries/Pagination.php
View
14 system/libraries/Pagination.php
@@ -460,13 +460,15 @@ public function create_links()
// Unset the controll, method, old-school routing options
unset($get['c'], $get['m'], $get[$this->query_string_segment]);
- if ( ! $get) $get = array();
-
- // Put everything else onto the end
- $query_string = (strpos($this->base_url, '&') !== FALSE ? '&' : '?') . http_build_query($get, '', '&');
+ if ( ! empty($get))
+ {
+ // Put everything else onto the end
+ $query_string = (strpos($this->base_url, '?') !== FALSE ? '&' : '?')
+ .http_build_query($get, '', '&');
- // Add this after the suffix to put it into more links easily
- $this->suffix .= $query_string;
+ // Add this after the suffix to put it into more links easily
+ $this->suffix .= $query_string;
+ }
}
// Render the "First" link

0 comments on commit 2b24139

Please sign in to comment.
Something went wrong with that request. Please try again.