]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #7649 from owncloud/routing-public
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 17 Mar 2014 20:07:05 +0000 (21:07 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 17 Mar 2014 20:07:05 +0000 (21:07 +0100)
Move routing classes to an interface and expose it in the public api

1  2 
lib/base.php
lib/private/api.php
ocs/v1.php

diff --cc lib/base.php
Simple merge
Simple merge
diff --cc ocs/v1.php
index 4cbc857bbcfea80726c9cbb00aaac327feaa07df,3da72e65f1c13e14e570fbb313265749d66c4ffd..5d360c530a9d35faa9f407decbac89f643f7b2b1
@@@ -26,12 -26,10 +26,12 @@@ use Symfony\Component\Routing\Exception
  use Symfony\Component\Routing\Exception\MethodNotAllowedException;
  
  try {
-       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);
  }