From 79ecefd0ec2cc7e2bcf35fad4f80e22d9ac70e16 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 15 Jul 2007 22:49:07 +0000
Subject: fix for scaffolding

---
 system/libraries/Language.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'system/libraries')

diff --git a/system/libraries/Language.php b/system/libraries/Language.php
index bcf84cf67..26775ec7e 100644
--- a/system/libraries/Language.php
+++ b/system/libraries/Language.php
@@ -49,7 +49,7 @@ class CI_Language {
 	 * @param	string	the language (english, etc.)
 	 * @return	void
 	 */
-	function load($langfile = '', $idiom = '')
+	function load($langfile = '', $idiom = '', $return = FALSE)
 	{	
 		$langfile = str_replace(EXT, '', str_replace('_lang.', '', $langfile)).'_lang'.EXT;
 		
@@ -82,12 +82,18 @@ class CI_Language {
 			}
 		}
 
+		
 		if ( ! isset($lang))
 		{
 			log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile);
 			return;
 		}
 		
+		if ($return == TRUE)
+		{
+			return $lang;
+		}
+		
 		$this->is_loaded[] = $langfile;
 		$this->language = array_merge($this->language, $lang);
 		unset($lang);
-- 
cgit v1.2.3-24-g4f1b