From: Côme Chilliet <come.chilliet@nextcloud.com>
Date: Wed, 30 Mar 2022 13:07:27 +0000 (+0200)
Subject: Use sabre function directly rather than duplicating it
X-Git-Tag: v25.0.0beta1~483^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9132ed8ef1dcc42c67cf5d0fa299d45606a1dfaa;p=nextcloud-server.git

Use sabre function directly rather than duplicating it

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---

diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index f896b825f2d..4079aa0595b 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -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);
 	}
 
 	/**