diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2012-03-12 14:44:42 +0100 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2012-03-12 14:44:42 +0100 |
| commit | 306f56c1bfdafd149b1059325a687ec1a185d00f (patch) | |
| tree | 62e2261c3b429153b9e62f3f676d7de6c18a6bfb /system/core/URI.php | |
| parent | db70d047a6ac256eb336a2b04385aa010d6cbf42 (diff) | |
| parent | b3442a165a091c552a3331ece94297d5fe316fee (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/all_flashdata
Diffstat (limited to 'system/core/URI.php')
| -rwxr-xr-x | system/core/URI.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/system/core/URI.php b/system/core/URI.php index b28ee198b..4a2e87c2a 100755 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -444,9 +444,7 @@ class CI_URI { return array(); } - return function_exists('array_fill_keys') - ? array_fill_keys($default, FALSE) - : array_combine($default, array_fill(0, count($default), FALSE)); + return array_fill_keys($default, FALSE); } $segments = array_slice($this->$segment_array(), ($n - 1)); |