summaryrefslogtreecommitdiffstats
path: root/system/codeigniter
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2007-07-20 02:01:13 +0200
committerRick Ellis <rick.ellis@ellislab.com>2007-07-20 02:01:13 +0200
commit30b40153739419d50c64e2dce338166a5c58ab58 (patch)
tree610dbb7ec96a57fedfd42ab51341d8ec6a010619 /system/codeigniter
parentc2c256143d99a0e6695cb2f16d968e27ef9e9036 (diff)
Diffstat (limited to 'system/codeigniter')
-rw-r--r--system/codeigniter/CodeIgniter.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 1cd66a187..160d86c8e 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -77,6 +77,7 @@ $EXT->_call_hook('pre_system');
*/
$CFG =& load_class('Config');
+$URI =& load_class('URI');
$RTR =& load_class('Router');
$OUT =& load_class('Output');
@@ -101,7 +102,6 @@ if ($EXT->_call_hook('cache_override') === FALSE)
*/
$IN =& load_class('Input');
-$URI =& load_class('URI');
$LANG =& load_class('Language');
/*
@@ -213,7 +213,7 @@ else
// Call the requested method.
// Any URI segments present (besides the class/function) will be passed to the method for convenience
- call_user_func_array(array(&$CI, $method), array_slice($RTR->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3)));
+ call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3)));
}
}