diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-25 02:21:55 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-25 02:21:55 -0800 |
| commit | 799e144b04a4b053d821410b06fb5c71dda4ed46 (patch) | |
| tree | e85da455d024f1d84e1129a3305c2c43962107d4 /lib/private/appframework | |
| parent | fb87b746f0255ad7e2e01eaecd1ed6def9bf3c94 (diff) | |
| parent | b3de86d851e04c73c67c1ca6522455130c8f6c53 (diff) | |
| download | nextcloud-server-799e144b04a4b053d821410b06fb5c71dda4ed46.tar.gz nextcloud-server-799e144b04a4b053d821410b06fb5c71dda4ed46.zip | |
Merge pull request #14151 from owncloud/update-sabre2.1
Sabre Update to 2.1
Diffstat (limited to 'lib/private/appframework')
| -rw-r--r-- | lib/private/appframework/http/request.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index 959ea273280..def284cdeab 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -543,7 +543,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { // strip off the script name's dir and file name // FIXME: Sabre does not really belong here - list($path, $name) = \Sabre\DAV\URLUtil::splitPath($scriptName); + list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($scriptName); if (!empty($path)) { if($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) { $pathInfo = substr($pathInfo, strlen($path)); @@ -575,7 +575,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { } $pathInfo = $this->getRawPathInfo(); - // following is taken from \Sabre\DAV\URLUtil::decodePathSegment + // following is taken from \Sabre\HTTP\URLUtil::decodePathSegment $pathInfo = rawurldecode($pathInfo); $encoding = mb_detect_encoding($pathInfo, ['UTF-8', 'ISO-8859-1']); |