upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-20 22:00:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Use sabre function directly rather than duplicating it

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2022-03-30 15:07:27 +02:00
parent 8a3f8b07a8
commit 9132ed8ef1
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/AppFramework/Http/Request.php
View file

@ -50,6 +50,7 @@ use OCP\IConfig;
use OCP\IRequest;
use OCP\IRequestId;
use OCP\Security\ICrypto;
use function Sabre\HTTP\decodePathSegment;
/**
* Class for accessing variables in the request.
@ -784,17 +785,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
*/
public function getPathInfo() {
$pathInfo = $this->getRawPathInfo();
// following is taken from \Sabre\HTTP\URLUtil::decodePathSegment
$pathInfo = rawurldecode($pathInfo);
$encoding = mb_detect_encoding($pathInfo, ['UTF-8', 'ISO-8859-1']);
switch ($encoding) {
case 'ISO-8859-1':
$pathInfo = utf8_encode($pathInfo);
}
// end copy
return $pathInfo;
return decodePathSegment($pathInfo);
}
/**