diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2015-05-26 16:51:30 +0200 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2015-05-26 16:51:30 +0200 |
| commit | a3b53a7738290d76126ebffca98fa2a2db93aaa9 (patch) | |
| tree | b29d2a2aca0e26931006b23db5fb12b7ae4558d6 | |
| parent | 94f7b3e25ca830b62cfe6221fed2ba03ea3ab75f (diff) | |
| parent | 609da64c3bc816a1d7f7599b39a693fb9913088b (diff) | |
| download | nextcloud-server-a3b53a7738290d76126ebffca98fa2a2db93aaa9.tar.gz nextcloud-server-a3b53a7738290d76126ebffca98fa2a2db93aaa9.zip | |
Merge pull request #16496 from owncloud/stable8-share-readonlyfile-permissions
[stable8] Do not automatically add "update" permission to shared mounts
| -rw-r--r-- | apps/files_sharing/tests/sharedstorage.php | 3 | ||||
| -rw-r--r-- | lib/private/files/view.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php index f840b9b964f..119f10f430a 100644 --- a/apps/files_sharing/tests/sharedstorage.php +++ b/apps/files_sharing/tests/sharedstorage.php @@ -182,9 +182,8 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase { // for the share root we expect: // the shared permissions (1) // the delete permission (8), to enable unshare - // the update permission (2), to allow renaming of the mount point $rootInfo = \OC\Files\Filesystem::getFileInfo($this->folder); - $this->assertSame(11, $rootInfo->getPermissions()); + $this->assertSame(9, $rootInfo->getPermissions()); // for the file within the shared folder we expect: // the shared permissions (1) diff --git a/lib/private/files/view.php b/lib/private/files/view.php index b58a8c2d639..6f456d8b759 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -1010,7 +1010,7 @@ class View { } if ($mount instanceof MoveableMount && $internalPath === '') { - $data['permissions'] |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE; + $data['permissions'] |= \OCP\Constants::PERMISSION_DELETE; } $data = \OC_FileProxy::runPostProxies('getFileInfo', $path, $data); |