diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2007-07-16 01:03:05 +0200 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2007-07-16 01:03:05 +0200 |
| commit | 873c722774f8cc43c737b5ee0befd8e6a0796bc8 (patch) | |
| tree | 63d05bd028196fe4088ebf1c221a4fc39e30c095 | |
| parent | 79ecefd0ec2cc7e2bcf35fad4f80e22d9ac70e16 (diff) | |
further scaffolding language fixes
| -rw-r--r-- | system/libraries/Loader.php | 13 | ||||
| -rw-r--r-- | system/scaffolding/Scaffolding.php | 2 |
2 files changed, 14 insertions, 1 deletions
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
|