diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2011-10-10 16:31:56 +0200 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2011-10-10 16:31:56 +0200 |
| commit | 8afb848fded8fbdfa24b72df7f067e960c83c0e8 (patch) | |
| tree | bf3d8fa70610253cb13a87c1aa9d634dcee9f413 /system/core/Lang.php | |
| parent | 25246b6b29d87ad7a4f304a7b5623c9f57953356 (diff) | |
| parent | bdbe6d222c15e9d1b42a8ee3a3e7fe04b753c1ba (diff) | |
Codeigniter develop latest.
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); |