Browse Source

Fix typo in "incoming"

Signed-off-by: Joas Schilling <coding@schilljs.com>
tags/v16.0.0alpha1
Joas Schilling 5 years ago
parent
commit
ee545d6840
No account linked to committer's email address

+ 2
- 2
apps/files_sharing/lib/Controller/ShareAPIController.php View File

@@ -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));

+ 2
- 2
apps/files_sharing/tests/CapabilitiesTest.php View File

@@ -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'],
];

+ 1
- 1
tests/lib/Share20/ManagerTest.php View File

@@ -1947,7 +1947,7 @@ class ManagerTest extends \Test\TestCase {
$manager->createShare($share);
}

public function testCreateShareOfIncommingFederatedShare() {
public function testCreateShareOfIncomingFederatedShare() {
$manager = $this->createManagerMock()
->setMethods(['canShare', 'generalCreateChecks', 'userCreateChecks', 'pathCreateChecks'])
->getMock();

Loading…
Cancel
Save