diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-12 08:14:10 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-12 08:14:10 +0100 |
| commit | 5fe23e863b79fe03fb8e73f7c77bd1c75f4de12d (patch) | |
| tree | b2fbb0e5e09dbe68494e356174c74f2806913002 /system/core/URI.php | |
| parent | 0aa9f2e86124194cd64fde098ba7a4169625d353 (diff) | |
| parent | 3d933b6fad72d4b92f18187dd57f1d3c35f8936a (diff) | |
Merge changes from upstream and fix _limit()
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)); |