diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-10 21:04:29 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-10 21:04:29 +0100 |
| commit | 189a34ec0949c6e96c896b92a8b1ea09ae9f232c (patch) | |
| tree | ddb25a94de1095598e1b88bc2d082552cef392e5 /system/core/Lang.php | |
| parent | 3c7c461a93145b045ba688585a5b606e28b7d7cb (diff) | |
| parent | b790371f328e49ed57eda85bf33817e033b85601 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/core/Lang.php')
| -rwxr-xr-x | system/core/Lang.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php index 088cb6c9c..c40a6856e 100755 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -130,7 +130,7 @@ class CI_Lang { } $this->is_loaded[] = $langfile; - $this->language = $this->language + $lang; + $this->language = array_merge($this->language, $lang); unset($lang); log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile); |