commit 373043fef2723d7cbdd768d1930363ac6fecba68
author Frank Michel <office@frankmichel.com> Thu Aug 25 00:11:00 2011 -0400
committer Frank Michel <office@frankmichel.com> Thu Aug 25 00:11:00 2011 -0400
tree 3187abc4b66e4fc8d26bc4993ea6fbb00ccb8787
parent 9ff6336415f3da2a81142cb23343060df6196ebe

fix for issue #292 with multiple language files

system/core/Lang.php

diff --git a/system/core/Lang.php b/system/core/Lang.php
index 5ac6718..e140a6a 100755
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -112,7 +112,7 @@
 		}
 
 
-		if ( ! isset($lang))
+		if ( ! isset($lang) || ! is_array($lang))
 		{
 			log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile);
 			return;
@@ -124,7 +124,7 @@
 		}
 
 		$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);