summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-11-18 03:25:08 +0100
committerGreg Aker <greg.aker@ellislab.com>2010-11-18 03:25:08 +0100
commitcc92210249d1ee2acbdeee8cd78306e3572669d1 (patch)
tree7f9460675d472fb324c55ba4bf993cd598e78b79 /system/core
parentec2f57133750caa5f5903e529a6ae776aebc4431 (diff)
Fix #237 get_instance() was being called in the output class before the CI_Controller exists.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Output.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 27a3a4bb0..0b708e110 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -214,7 +214,7 @@ class CI_Output {
global $BM, $CFG;
// Grab the super object if we can.
- if (function_exists('get_instance'))
+ if (class_exists('CI_Controller'))
{
$CI =& get_instance();
}