diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-03-13 11:51:33 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-03-13 11:51:33 +0100 |
commit | c1cda232d690723db6e704b738c91f84cfc49a9e (patch) | |
tree | a7e91130e3b6139f5ce9f515635863eee457cb7e /system/core/URI.php | |
parent | 30da39bb5d65c37203c12a42dfc50f7d231fb2d1 (diff) | |
parent | d153002858256c6f206c8877f4952ed075902f9e (diff) |
Merge upstream branch
Diffstat (limited to 'system/core/URI.php')
-rwxr-xr-x | system/core/URI.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/system/core/URI.php b/system/core/URI.php index db5b8e44b..4a2e87c2a 100755 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -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)); |