summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/core/CodeIgniter.php2
-rw-r--r--system/core/Controller.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index e701cc323..3dfefc2ef 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -261,7 +261,7 @@
if ( ! class_exists($class)
OR $method == 'controller'
OR strncmp($method, '_', 1) == 0
- OR in_array(strtolower($method), array_map('strtolower', get_class_methods('Controller')))
+ OR in_array(strtolower($method), array_map('strtolower', get_class_methods('CI_Controller')))
)
{
show_404("{$class}/{$method}");
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.