summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-01-10 19:50:00 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-01-10 19:50:00 +0100
commit9d587505fbb7f6f886802cd2a72f1ffcc97826d3 (patch)
tree7e408ba7b865dac429761850f017b695bd51d3f7
parente9a5a862a1252548b463aa738e50e8d9bfd01379 (diff)
parent4b13061308301cd307fe5317604265ab934fb046 (diff)
Merge pull request #911 from narfbg/develop-fix-lang
Fixed a bug in CI_Lang::load()
-rwxr-xr-xsystem/core/Lang.php2
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);