diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-13 00:58:06 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-13 00:58:06 +0200 |
| commit | b9e515bfeb934efa98beda9e9aa38d232933aba9 (patch) | |
| tree | fb85be415e8ff96feb1ad9914db3995a04b5f5d0 /lib | |
| parent | a743ceb8d53ed25eb9e0a2059d2652c04f77c345 (diff) | |
| parent | e03f0542e483c6d678414b0f3338110d0d506e8f (diff) | |
| download | nextcloud-server-b9e515bfeb934efa98beda9e9aa38d232933aba9.tar.gz nextcloud-server-b9e515bfeb934efa98beda9e9aa38d232933aba9.zip | |
Merge pull request #19723 from owncloud/strip-directory
Strip directory from scriptName
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/api.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/api.php b/lib/private/api.php index cd5148c51a1..10d58f2d9e6 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -386,7 +386,7 @@ class OC_API { $meta = $result->getMeta(); $data = $result->getData(); - if (self::isV2()) { + if (self::isV2(\OC::$server->getRequest())) { $statusCode = self::mapStatusCodes($result->getStatusCode()); if (!is_null($statusCode)) { $meta['statuscode'] = $statusCode; @@ -449,13 +449,13 @@ class OC_API { } /** - * @return boolean + * @param \OCP\IRequest $request + * @return bool */ - private static function isV2() { - $request = \OC::$server->getRequest(); + protected static function isV2(\OCP\IRequest $request) { $script = $request->getScriptName(); - return $script === '/ocs/v2.php'; + return substr($script, -11) === '/ocs/v2.php'; } /** |