summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 9169a1252..c884df1cf 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -271,7 +271,7 @@ class CI_Loader {
$db_conn = '';
}
- $CI->load->database($db_conn, FALSE, TRUE);
+ $this->database($db_conn, FALSE, TRUE);
}
if ( ! class_exists('CI_Model', FALSE))
@@ -623,12 +623,12 @@ class CI_Loader {
*/
public function language($files, $lang = '')
{
- $CI =& get_instance();
+ $LNG =& get_instance()->lang;
is_array($files) OR $files = array($files);
foreach ($files as $langfile)
{
- $CI->lang->load($langfile, $lang);
+ $LNG->load($langfile, $lang);
}
return $this;