diff options
Diffstat (limited to 'system/core/URI.php')
| -rw-r--r-- | system/core/URI.php | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/system/core/URI.php b/system/core/URI.php index 900472b61..fb8540118 100644 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) * @link http://codeigniter.com * @since Version 1.0 @@ -506,23 +506,13 @@ class CI_URI { return $default; } - in_array($which, array('segment', 'rsegment'), TRUE) OR $which = 'segment'; - if (isset($this->keyval[$which], $this->keyval[$which][$n])) { return $this->keyval[$which][$n]; } - if ($which === 'segment') - { - $total_segments = 'total_segments'; - $segment_array = 'segment_array'; - } - else - { - $total_segments = 'total_rsegments'; - $segment_array = 'rsegment_array'; - } + $total_segments = "total_{$which}s"; + $segment_array = "{$which}_array"; if ($this->$total_segments() < $n) { |