From 873c722774f8cc43c737b5ee0befd8e6a0796bc8 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 15 Jul 2007 23:03:05 +0000
Subject: further scaffolding language fixes

---
 system/libraries/Loader.php        | 13 +++++++++++++
 system/scaffolding/Scaffolding.php |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 7fa46c3ad..ee99696a0 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -500,6 +500,19 @@ class CI_Loader {
 			$CI->lang->load($langfile, $lang);
 		}
 	}
+
+	/**
+	 * Loads a language file
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */
+	function scaffold_language($file = '', $lang = '', $return = FALSE)
+	{
+		$CI =& get_instance();
+		return $CI->lang->load($file, $lang, $return);
+	}
 	
 	// --------------------------------------------------------------------
 	
diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php
index fe2744e77..6f4babd91 100644
--- a/system/scaffolding/Scaffolding.php
+++ b/system/scaffolding/Scaffolding.php
@@ -73,7 +73,7 @@ class Scaffolding {
 		$this->CI->load->vars($data);
 		
 		// Load the language file and create variables
-		$this->lang = $this->CI->load->language('scaffolding', '', TRUE);		
+		$this->lang = $this->CI->load->scaffold_language('scaffolding', '', TRUE);
 		$this->CI->load->vars($this->lang);
 				
 		//  Load the helper files we plan to use
-- 
cgit v1.2.3-24-g4f1b