summaryrefslogtreecommitdiffstats
path: root/system/core/Controller.php
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-11-09 20:46:13 +0100
committerGreg Aker <greg.aker@ellislab.com>2010-11-09 20:46:13 +0100
commit63277b81edde11b77ff94cbf1c3e5db16c97c4bf (patch)
treee03d08dcba5de6a97576bbdd6565891dc1d98256 /system/core/Controller.php
parent6b6c274e00fe2357004c0a4e38e6bdb0b2e0ddb4 (diff)
Fix #62 Adding CI_ prefix to Controller.
Diffstat (limited to 'system/core/Controller.php')
-rw-r--r--system/core/Controller.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 9bd9912dc..e250caf4b 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -27,17 +27,17 @@
* @author ExpressionEngine Dev Team
* @link http://codeigniter.com/user_guide/general/controllers.html
*/
-class Controller extends CI_Base {
+class CI_Controller extends CI_Base {
/**
* Constructor
*
* Calls the initialize() function
*/
- function Controller()
+ function CI_Controller()
{
parent::CI_Base();
-
+
// Assign all the class objects that were instantiated by the
// bootstrap file (CodeIgniter.php) to local class variables
// so that CI can run as one big super object.