Commits

Francesco Laurita committed a95aa30

Reverted from 1959ee430128. Need more test

Comments (0)

Files changed (1)

system/core/CodeIgniter.php

 		OR in_array(strtolower($method), array_map('strtolower', get_class_methods('CI_Controller')))
 		)
 	{
-		// Check and see if we are using a 404 override and use it.
-		if ( ! empty($RTR->routes['404_override']))
-		{
-			$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.'.php'))
-				{
-					show_404("{$class}/{$method}");
-				}
-
-				include_once(APPPATH.'controllers/'.$class.'.php');
-				unset($CI);
-				$CI = new $class();
-			}
-		}
-		else
-		{
-			show_404("{$class}/{$method}");
-		}
+		show_404("{$class}/{$method}");
 	}
 
 /*