From c47e46fda096563eadfae49308c7f436611a286b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 27 Nov 2013 15:35:49 +0100 Subject: [PATCH 1/2] fix custom routes defined by apps --- lib/private/request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/request.php b/lib/private/request.php index 37d918d203..6b4a2321ba 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -165,7 +165,7 @@ class OC_Request { if (strpos($path_info, $name) === 0) { $path_info = substr($path_info, strlen($name)); } - return rtrim($path_info, '/'); + return $path_info; } /** From 885d04bc86ef5e34977cf7df6cb55c991d5d3306 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 27 Nov 2013 21:28:54 +0100 Subject: [PATCH 2/2] Fix getRawPathInfo for the '/' edge case --- lib/private/request.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/request.php b/lib/private/request.php index 6b4a2321ba..b2afda3592 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -165,7 +165,11 @@ class OC_Request { if (strpos($path_info, $name) === 0) { $path_info = substr($path_info, strlen($name)); } - return $path_info; + if($path_info === '/'){ + return ''; + } else { + return $path_info; + } } /**