| commit | cc92210249d1ee2acbdeee8cd78306e3572669d1 | [log] [tgz] |
|---|---|---|
| author | Greg Aker <greg.aker@ellislab.com> | Wed Nov 17 20:25:08 2010 -0600 |
| committer | Greg Aker <greg.aker@ellislab.com> | Wed Nov 17 20:25:08 2010 -0600 |
| tree | 7f9460675d472fb324c55ba4bf993cd598e78b79 | |
| parent | ec2f57133750caa5f5903e529a6ae776aebc4431 [diff] [blame] |
Fix #237 get_instance() was being called in the output class before the CI_Controller exists.
diff --git a/system/core/Output.php b/system/core/Output.php index 27a3a4b..0b708e1 100644 --- a/system/core/Output.php +++ b/system/core/Output.php
@@ -214,7 +214,7 @@ global $BM, $CFG; // Grab the super object if we can. - if (function_exists('get_instance')) + if (class_exists('CI_Controller')) { $CI =& get_instance(); }