summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-01-30 06:23:32 +0100
committerDerek Jones <derek.jones@ellislab.com>2008-01-30 06:23:32 +0100
commitf30445be8871f71bca9a4b11fa4e49edff0ac936 (patch)
tree45308fa76746d233ae43beed8f41ad553339ceb3
parentd45379e879419a3de63ab226b2458c4764c7c001 (diff)
Fixed a bug (#2849) with arguments passed to a subfolder controller - CodeIgniter.php was expecting the subfolder to still be in $URI->rsegments, but it is removed already by Router::_validate_request()
-rw-r--r--system/codeigniter/CodeIgniter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 7556f48d3..1af8023e0 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -221,7 +221,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($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3)));
+ call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, 2));
}
}