mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2452 from nextcloud/stable10-1826 

[stable10] Fix post_unshareFromSelf hook parameter format
This commit is contained in:
Morris Jobke 2016-12-02 10:41:57 +01:00 committed by GitHub
parent 8f8250caf4 f07c209cb9
commit ed71ecc2b2
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/files_sharing/tests/GroupEtagPropagationTest.php
View File

@ -122,4 +122,26 @@ class GroupEtagPropagationTest extends PropagationTestCase {
$this->assertAllUnchanged(); $this->assertAllUnchanged();
} }
public function testRecipientUnsharesFromSelf() {
$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
$this->assertTrue(
$this->rootView->unlink('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test')
);
$this->assertEtagsChanged([self::TEST_FILES_SHARING_API_USER2]);
$this->assertAllUnchanged();
}
public function testRecipientUnsharesFromSelfUniqueGroupShare() {
$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
// rename to create an extra entry in the share table
$this->rootView->rename('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test', '/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test_renamed');
$this->assertTrue(
$this->rootView->unlink('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test_renamed')
);
$this->assertEtagsChanged([self::TEST_FILES_SHARING_API_USER2]);
$this->assertAllUnchanged();
}
} }

4
lib/private/Share/Share.php
View File

@ -1059,7 +1059,7 @@ class Share extends Constants {
if (isset($groupShare['file_target'])) { if (isset($groupShare['file_target'])) {
$shareTmp['fileTarget'] = $groupShare['file_target']; $shareTmp['fileTarget'] = $groupShare['file_target'];
} }
$listOfUnsharedItems = array_merge($listOfUnsharedItems, array($groupShare)); $listOfUnsharedItems = array_merge($listOfUnsharedItems, [$shareTmp]);
$itemUnshared = true; $itemUnshared = true;
} elseif (!$itemUnshared && isset($uniqueGroupShare)) { } elseif (!$itemUnshared && isset($uniqueGroupShare)) {
$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?'); $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
@ -1074,7 +1074,7 @@ class Share extends Constants {
if (isset($uniqueGroupShare['file_target'])) { if (isset($uniqueGroupShare['file_target'])) {
$shareTmp['fileTarget'] = $uniqueGroupShare['file_target']; $shareTmp['fileTarget'] = $uniqueGroupShare['file_target'];
} }
$listOfUnsharedItems = array_merge($listOfUnsharedItems, array($uniqueGroupShare)); $listOfUnsharedItems = array_merge($listOfUnsharedItems, [$shareTmp]);
$itemUnshared = true; $itemUnshared = true;
} }