From c9e2b10f08a3c718e52e287e2dd14b880e4e3057 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Thu, 12 Jul 2007 12:14:45 +0000
Subject: added language files to autoload

---
 system/libraries/Language.php |  5 -----
 system/libraries/Loader.php   | 25 ++++++++++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'system/libraries')

diff --git a/system/libraries/Language.php b/system/libraries/Language.php
index 26775ec7e..94923a3e7 100644
--- a/system/libraries/Language.php
+++ b/system/libraries/Language.php
@@ -89,11 +89,6 @@ class CI_Language {
 			return;
 		}
 		
-		if ($return == TRUE)
-		{
-			return $lang;
-		}
-		
 		$this->is_loaded[] = $langfile;
 		$this->language = array_merge($this->language, $lang);
 		unset($lang);
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index abe3a1c37..7fa46c3ad 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -481,13 +481,24 @@ class CI_Loader {
 	 * Loads a language file
 	 *
 	 * @access	public
+	 * @param	array
 	 * @param	string
+	 * @param	bool
 	 * @return	void
 	 */
-	function language($file = '', $lang = '', $return = FALSE)
+	function language($file = array(), $lang = '')
 	{
 		$CI =& get_instance();
-		return $CI->lang->load($file, $lang, $return);
+
+		if ( ! is_array($file))
+		{
+			$file = array($file);
+		}
+
+		foreach ($file as $langfile)
+		{	
+			$CI->lang->load($langfile, $lang);
+		}
 	}
 	
 	// --------------------------------------------------------------------
@@ -813,7 +824,7 @@ class CI_Loader {
 			return FALSE;
 		}
 		
-		// Load any custome config file
+		// Load any custom config file
 		if (count($autoload['config']) > 0)
 		{			
 			$CI =& get_instance();
@@ -823,15 +834,15 @@ class CI_Loader {
 			}
 		}		
 
-		// Load plugins, helpers, and scripts
-		foreach (array('helper', 'plugin', 'script') as $type)
-		{
+		// Autoload plugins, helpers, scripts and languages
+		foreach (array('helper', 'plugin', 'script', 'language') as $type)
+		{			
 			if (isset($autoload[$type]) AND count($autoload[$type]) > 0)
 			{
 				$this->$type($autoload[$type]);
 			}		
 		}
-		
+
 		// A little tweak to remain backward compatible
 		// The $autoload['core'] item was deprecated
 		if ( ! isset($autoload['libraries']))
-- 
cgit v1.2.3-24-g4f1b