Don't use globals
- Use load_class() to get objects during bootstrap process.
- Change load_class() to accept a class constructor parameter
instead of previously unused class name prefix.
- Change CI_Router::__construct() to accept as a parameter.
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 6d67471..df5fa3b 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -212,7 +212,7 @@
* Instantiate the routing class and set the routing
* ------------------------------------------------------
*/
- $RTR =& load_class('Router', 'core');
+ $RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
/*
* ------------------------------------------------------
@@ -226,8 +226,7 @@
* Is there a valid cache file? If so, we're done...
* ------------------------------------------------------
*/
- if ($EXT->call_hook('cache_override') === FALSE
- && $OUT->_display_cache($CFG, $URI) === TRUE)
+ if ($EXT->call_hook('cache_override') === FALSE && $OUT->_display_cache($CFG, $URI) === TRUE)
{
exit;
}