upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Merge pull request #31758 from nextcloud/fix/utf8-detection-fix

Browse source 
Use sabre function directly rather than duplicating it
This commit is contained in:
blizzz 2022-04-29 13:05:57 +02:00 committed by GitHub
commit 033d527deb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/psalm-baseline.xml
View file

@ -2537,7 +2537,8 @@
<RedundantCondition occurrences="1">
<code>\is_array($params)</code>
</RedundantCondition>
<UndefinedFunction occurrences="1">
<UndefinedFunction occurrences="2">
<code>\Sabre\HTTP\decodePath($pathInfo)</code>
<code>\Sabre\Uri\split($scriptName)</code>
</UndefinedFunction>
</file>

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

@ -784,17 +784,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 \Sabre\HTTP\decodePath($pathInfo);
}
/**