diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-21 17:05:08 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-21 17:05:08 +0400 |
| commit | 6ff96b34ad0462ad05c34633ccd08236b93bf195 (patch) | |
| tree | 1acd7eb869d512b5a3fc9502961a98591ea20cfa /ocs | |
| parent | e139f7c863d5971a6386070148496cb0f70ad04e (diff) | |
| parent | 37af74efb3e3511b2d6eacef67dc90f22a685bd3 (diff) | |
Merge branch 'master' into load-apps-proper-master
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
Diffstat (limited to 'ocs')
| -rw-r--r-- | ocs/providers.php | 2 | ||||
| -rw-r--r-- | ocs/v1.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ocs/providers.php b/ocs/providers.php index bf94b85dcfb..2c62f767ad3 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -23,6 +23,8 @@ require_once '../lib/base.php'; +header('Content-type: application/xml'); + $url=OCP\Util::getServerProtocol().'://'.substr(OCP\Util::getServerHost().OCP\Util::getRequestUri(), 0, -17).'ocs/v1.php/'; echo(' diff --git a/ocs/v1.php b/ocs/v1.php index 93d9c67b045..62a3511e611 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -30,12 +30,12 @@ try { // load all apps to get all api routes properly setup OC_App::loadApps(); - // match the request - OC::getRouter()->match('/ocs'.OC_Request::getRawPathInfo()); - + OC::$server->getRouter()->match('/ocs'.OC_Request::getRawPathInfo()); } catch (ResourceNotFoundException $e) { + OC_API::setContentType(); OC_OCS::notFound(); } catch (MethodNotAllowedException $e) { + OC_API::setContentType(); OC_Response::setStatus(405); } |