fix for issue #292 with multiple language files #293

Merged
merged 2 commits into from Aug 25, 2011

2 participants

@frankmichel

this fix allows to user numeric keys in language files

@frankmichel frankmichel commented on an outdated diff Aug 25, 2011
system/core/Lang.php
@@ -112,7 +112,7 @@ class CI_Lang {
}
- if ( ! isset($lang))
+ if ( ! isset($lang) || ! is_array($lang))

an array check needs to be added here. otherwise the + operation in line 127 will throw an error if not both parameters are arrays...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@derekjones derekjones merged commit 56673ff into bcit-ci:develop Aug 25, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment