diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-09-09 16:11:36 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-09-09 16:11:36 +0200 |
| commit | 6b22006f52384545e385a31aae8447edf16ac478 (patch) | |
| tree | bb2d950bef88a34bdd0db22bd709e9839bd9cd9f | |
| parent | 7445afdb6fb98338e5691d2fe01a9d1008666281 (diff) | |
| parent | 29dd7d83c4ec5a82cc75f1da54b4101b2bb986e6 (diff) | |
| download | nextcloud-server-6b22006f52384545e385a31aae8447edf16ac478.tar.gz nextcloud-server-6b22006f52384545e385a31aae8447edf16ac478.zip | |
Merge pull request #18931 from owncloud/fix-files_sharing-breakage
Check if files_sharing is actually enabled before using it
| -rw-r--r-- | ocs/routes.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ocs/routes.php b/ocs/routes.php index f8e6f33c48a..9a8625bcc31 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -104,31 +104,33 @@ API::register( ); // Server-to-Server Sharing -$s2s = new \OCA\Files_Sharing\API\Server2Server(); -API::register('post', +if (\OC::$server->getAppManager()->isEnabledForUser('files_sharing')) { + $s2s = new \OCA\Files_Sharing\API\Server2Server(); + API::register('post', '/cloud/shares', array($s2s, 'createShare'), 'files_sharing', API::GUEST_AUTH -); + ); -API::register('post', + API::register('post', '/cloud/shares/{id}/accept', array($s2s, 'acceptShare'), 'files_sharing', API::GUEST_AUTH -); + ); -API::register('post', + API::register('post', '/cloud/shares/{id}/decline', array($s2s, 'declineShare'), 'files_sharing', API::GUEST_AUTH -); + ); -API::register('post', + API::register('post', '/cloud/shares/{id}/unshare', array($s2s, 'unshare'), 'files_sharing', API::GUEST_AUTH -); + ); +} |