| commit | 4b13061308301cd307fe5317604265ab934fb046 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Tue Jan 10 16:09:55 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Tue Jan 10 16:09:55 2012 +0200 |
| tree | 7e408ba7b865dac429761850f017b695bd51d3f7 | |
| parent | e9a5a862a1252548b463aa738e50e8d9bfd01379 [diff] [blame] |
Fixed a bug in CI_Lang::load()
diff --git a/system/core/Lang.php b/system/core/Lang.php index 088cb6c..c40a685 100755 --- a/system/core/Lang.php +++ b/system/core/Lang.php
@@ -130,7 +130,7 @@ } $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);