diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-12-05 11:27:38 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2018-12-05 11:27:38 +0100 |
| commit | ee545d684042c2b602cff9f80b740f89d8484352 (patch) | |
| tree | b2f1cf372ad7cd30aa675966ca09268709f397b2 /apps | |
| parent | 4deec15a8cf202730d0ac9851029263423a81f70 (diff) | |
| download | nextcloud-server-ee545d684042c2b602cff9f80b740f89d8484352.tar.gz nextcloud-server-ee545d684042c2b602cff9f80b740f89d8484352.zip | |
Fix typo in "incoming"
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareAPIController.php | 4 | ||||
| -rw-r--r-- | apps/files_sharing/tests/CapabilitiesTest.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 2bd535e319f..797558fbd9a 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -809,7 +809,7 @@ class ShareAPIController extends OCSController { } if ($share->getShareOwner() !== $this->currentUser && $share->getSharedBy() !== $this->currentUser) { - throw new OCSForbiddenException('You are not allowed to edit incomming shares'); + throw new OCSForbiddenException('You are not allowed to edit incoming shares'); } if ($permissions === null && @@ -955,7 +955,7 @@ class ShareAPIController extends OCSController { } if ($permissions !== null && $share->getShareOwner() !== $this->currentUser) { - /* Check if this is an incomming share */ + /* Check if this is an incoming share */ $incomingShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $share->getNode(), -1, 0); $incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0)); $incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $share->getNode(), -1, 0)); diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php index 721dd0fbf5e..077f2cdbe71 100644 --- a/apps/files_sharing/tests/CapabilitiesTest.php +++ b/apps/files_sharing/tests/CapabilitiesTest.php @@ -249,7 +249,7 @@ class CapabilitiesTest extends \Test\TestCase { $this->assertTrue($result['group_sharing']); } - public function testFederatedSharingIncomming() { + public function testFederatedSharingIncoming() { $map = [ ['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'yes'], ]; @@ -258,7 +258,7 @@ class CapabilitiesTest extends \Test\TestCase { $this->assertTrue($result['federation']['incoming']); } - public function testFederatedSharingNoIncomming() { + public function testFederatedSharingNoIncoming() { $map = [ ['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'no'], ]; |