Take into account the core.url_suffix configuration setting when

parsing REST urls.  This fixes the problem that setting the url suffix
breaks REST.  Fixes #1500.

1 files changed, 3 insertions, 0 deletions

diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index a721ff2b..c4e0fda4 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -86,6 +86,9 @@ class Rest_Controller extends Controller {
       }
 
       $request->url = url::abs_current(true);
+      if ($suffix = Kohana::config('core.url_suffix')) {
+        $request->url = substr($request->url, 0, strlen($request->url) - strlen($suffix));
+      }
 
       rest::set_active_user($request->access_key);