From d6fdb4d8323e79e2d4d7949762de366cde8834c5 Mon Sep 17 00:00:00 2001
From: Pascal Kriete <pascal.kriete@ellislab.com>
Date: Tue, 9 Nov 2010 15:16:56 -0500
Subject: Adding unicode to the list of core classes.

---
 user_guide/general/core_classes.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index a75034593..ac965aee3 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -84,6 +84,7 @@ know what you are doing before attempting it.</p>
 <li>Log</li>
 <li>Output</li>
 <li>Router</li>
+<li>Unicode</li>
 <li>URI</li>
 </ul>
 
-- 
cgit v1.2.3-24-g4f1b


From 3431ae375f7e9283ccfe7e165f39bfc84d79f694 Mon Sep 17 00:00:00 2001
From: Pascal Kriete <pascal.kriete@ellislab.com>
Date: Tue, 9 Nov 2010 15:19:50 -0500
Subject: Adding a second parameter to _remap that contains an array of the
 leftover segments.

---
 system/core/CodeIgniter.php         | 2 +-
 user_guide/general/controllers.html | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index e701cc323..b52281918 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
 	{
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 782fbfa7e..cdc4b3ee5 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -229,7 +229,7 @@ CodeIgniter permits you to override this behavior through the use of the <kbd>_r
 get called regardless of what your URI contains.  It overrides the normal behavior in which the URI determines which function is called,
 allowing you to define your own function routing rules.</p>
 
-<p>The overridden function call (typically the second segment of the URI) will be passed as a parameter the <kbd>_remap()</kbd> function:</p>
+<p>The overridden function call (typically the second segment of the URI) will be passed as a parameter to the <kbd>_remap()</kbd> function:</p>
 
 <code>function _remap(<var>$method</var>)<br />
 {<br />
@@ -243,6 +243,7 @@ allowing you to define your own function routing rules.</p>
 &nbsp;&nbsp;&nbsp;&nbsp;}<br />
 }</code>
 
+<p>An array of leftover segments are passed into <kbd>_remap()</kbd> as an optional second parameter.</p>
 
 
 
-- 
cgit v1.2.3-24-g4f1b