From 373043fef2723d7cbdd768d1930363ac6fecba68 Mon Sep 17 00:00:00 2001
From: Frank Michel <office@frankmichel.com>
Date: Thu, 25 Aug 2011 00:11:00 -0400
Subject: fix for issue #292 with multiple language files

---
 system/core/Lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/core')

diff --git a/system/core/Lang.php b/system/core/Lang.php
index 5ac671838..e140a6a60 100755
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -112,7 +112,7 @@ class CI_Lang {
 		}
 
 
-		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 @@ 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);
-- 
cgit v1.2.3-24-g4f1b