summaryrefslogtreecommitdiff
path: root/modules/rest/controllers
diff options
context:
space:
mode:
authormamouneyya <mamoun.diraneyya@gmail.com>2010-12-09 18:31:01 +0200
committermamouneyya <mamoun.diraneyya@gmail.com>2010-12-09 18:31:01 +0200
commit3e2610ea83c60805d5e727df6509da6c49fd6c7b (patch)
tree28638f7a1cd2e298587f4b3960caf409f7d2d2fa /modules/rest/controllers
parent6aabab4b715ff8ac00cc667e9d0a40c9868410d8 (diff)
parentc3ef8921260db8e39b6d2a7b4708e3d19f35f8b5 (diff)
Merge remote branch 'gallery3/master'
Diffstat (limited to 'modules/rest/controllers')
-rw-r--r--modules/rest/controllers/rest.php3
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);