diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
| commit | 2716398bd2f2ae36d7420c591fc759e0951ba0e2 (patch) | |
| tree | 3845d6bacc5660559740a8eddd43210bbb14fefd /system/libraries/Pagination.php | |
| parent | eeb6a480a4a25b7fe96e9ba0cf3aef273fd13c67 (diff) | |
| parent | e8bc5f4450381b4f978f274f3e93604301115b64 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/libraries/Pagination.php')
| -rw-r--r-- | system/libraries/Pagination.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 5573f6407..e1e729bb0 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -52,20 +52,20 @@ class CI_Pagination { protected $full_tag_open = ''; protected $full_tag_close = ''; protected $first_tag_open = ''; - protected $first_tag_close = ' '; - protected $last_tag_open = ' '; + protected $first_tag_close = ''; + protected $last_tag_open = ''; protected $last_tag_close = ''; protected $first_url = ''; // Alternative URL for the First Page. - protected $cur_tag_open = ' <strong>'; + protected $cur_tag_open = '<strong>'; protected $cur_tag_close = '</strong>'; - protected $next_tag_open = ' '; - protected $next_tag_close = ' '; - protected $prev_tag_open = ' '; + protected $next_tag_open = ''; + protected $next_tag_close = ''; + protected $prev_tag_open = ''; protected $prev_tag_close = ''; - protected $num_tag_open = ' '; + protected $num_tag_open = ''; protected $num_tag_close = ''; protected $page_query_string = FALSE; - protected $query_string_segment = 'per_page'; + protected $query_string_segment = 'per_page'; protected $display_pages = TRUE; protected $_attributes = ''; protected $_link_types = array(); @@ -215,7 +215,8 @@ class CI_Pagination { // string. If post, add a trailing slash to the base URL if needed if ($CI->config->item('enable_query_strings') === TRUE OR $this->page_query_string === TRUE) { - $this->base_url = rtrim($this->base_url).'&'.$this->query_string_segment.'='; + $segment = (strpos($this->base_url, '?')) ? '&' : '?'; + $this->base_url = rtrim($this->base_url).$segment.$this->query_string_segment.'='; } else { |