summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-09 21:20:04 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-09 21:20:04 +0100
commit7d8e8201a7c7ac160f0f07e806cd6284762defab (patch)
tree0d0073c3b51800ef3339b6efe09364f08ab7be5b /system
parent64b44a22605f6aca5ae43c78b7e220625846216e (diff)
parent3431ae375f7e9283ccfe7e165f39bfc84d79f694 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'system')
-rw-r--r--system/core/CodeIgniter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 3dfefc2ef..bf412b21d 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -299,7 +299,7 @@
// Is there a "remap" function? If so, we call it instead
if (method_exists($CI, '_remap'))
{
- $CI->_remap($method);
+ $CI->_remap($method, array_slice($URI->rsegments, 2));
}
else
{