diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-26 10:58:53 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-26 10:58:53 +0200 |
| commit | a6aa8beaa98fac53c2cc15972bf3d1400d0c4f6a (patch) | |
| tree | 292e04610b55d963ea19a14c805d75b6e90ea9a5 /system/core/Lang.php | |
| parent | 38e4a7765642f8945bf1c7668eb35e3a9de8cbb8 (diff) | |
| parent | b1099b3d3d6908a0b35a0d5a804b4b6e4fd57f66 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Lang.php')
| -rwxr-xr-x | system/core/Lang.php | 4 |
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); |