diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-12-05 13:45:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 13:45:13 +0100 |
| commit | 4f52f033e70acb6af8d6afb595de1eb81b8aea04 (patch) | |
| tree | 1f76c10bbde19e20357db5e3dc63cb5341df4909 /apps | |
| parent | 2c30664bdf5de69f7ef0b27024cb9e87070cf8ab (diff) | |
| parent | ee545d684042c2b602cff9f80b740f89d8484352 (diff) | |
| download | nextcloud-server-4f52f033e70acb6af8d6afb595de1eb81b8aea04.tar.gz nextcloud-server-4f52f033e70acb6af8d6afb595de1eb81b8aea04.zip | |
Merge pull request #12846 from nextcloud/typo/noid/fix-spelling-of-incoming
Fix typo in "incoming"
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'], ]; |