summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-25 17:19:17 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-25 17:19:17 +0200
commit56673ff7121966bdbadee0903b874cb97de6b74b (patch)
tree3434290cac1f5c867f0ba9aa28348759901c4aa5 /system
parent9ff6336415f3da2a81142cb23343060df6196ebe (diff)
parentcb272b60e55882246677db929bc2e0a58f31397d (diff)
Merge pull request #293 from frankmichel/develop
fix for issue #292 with multiple language files
Diffstat (limited to 'system')
-rwxr-xr-xsystem/core/Lang.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php
index 5ac671838..d61d1029a 100755
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -112,7 +112,7 @@ class CI_Lang {
}
- if ( ! isset($lang))
+ if ( ! isset($lang) OR ! is_array($lang))
{
log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile);
return;
@@ -124,7 +124,7 @@ class CI_Lang {
}
$this->is_loaded[] = $langfile;
- $this->language = array_merge($this->language, $lang);
+ $this->language = $this->language + $lang;
unset($lang);
log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile);