summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php3
-rw-r--r--system/core/Model.php3
2 files changed, 2 insertions, 4 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index daf326f25..78172580d 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -642,8 +642,7 @@ class CI_Loader {
*/
public function config($file, $use_sections = FALSE, $fail_gracefully = FALSE)
{
- $CI =& get_instance();
- return $CI->config->load($file, $use_sections, $fail_gracefully);
+ return get_instance()->config->load($file, $use_sections, $fail_gracefully);
}
// --------------------------------------------------------------------
diff --git a/system/core/Model.php b/system/core/Model.php
index 1eb6f909b..11e60759b 100644
--- a/system/core/Model.php
+++ b/system/core/Model.php
@@ -59,8 +59,7 @@ class CI_Model {
*/
public function __get($key)
{
- $CI =& get_instance();
- return $CI->$key;
+ return get_instance()->$key;
}
}