Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for issue #292 with multiple language files #293

Merged
merged 2 commits into from
Aug 25, 2011
Merged

fix for issue #292 with multiple language files #293

merged 2 commits into from
Aug 25, 2011

Conversation

frankmichel
Copy link
Contributor

this fix allows to user numeric keys in language files

@@ -112,7 +112,7 @@ class CI_Lang {
}


if ( ! isset($lang))
if ( ! isset($lang) || ! is_array($lang))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

derekjones pushed a commit that referenced this pull request Aug 25, 2011
fix for issue #292 with multiple language files
@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants