diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-02 22:19:43 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-02 22:19:43 +0100 |
| commit | 4b679a786af0c35486ff8a32d67aea3a58134fdd (patch) | |
| tree | bb782312958d0cb19d8bf5722a17c1bd902bbde5 /system | |
| parent | d88b31550ae2aeb0e3bcc11ba82d4838f8a5fd31 (diff) | |
| parent | 5519e3d5d3311275a6fb2aa4962f9cea1626996c (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/CodeIgniter.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 0414ffbf1..567e67f65 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -295,6 +295,17 @@ $x = explode('/', $RTR->routes['404_override']); $class = $x[0]; $method = (isset($x[1]) ? $x[1] : 'index'); + if ( ! class_exists($class)) + { + if ( ! file_exists(APPPATH.'controllers/'.$class.EXT)) + { + show_404("{$class}/{$method}"); + } + + include_once(APPPATH.'controllers/'.$class.EXT); + unset($CI); + $CI = new $class(); + } } else { |