diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-01-15 11:06:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 11:06:34 +0100 |
| commit | cc05aa2044eb96a34c92f892a6c3901729ca153e (patch) | |
| tree | d9c59164675483c25e325944ea30a37cf10d94f5 /apps/files_sharing/lib/Controller | |
| parent | 0f238623f6fcbc6605580d79f9705eab9bfcdf5a (diff) | |
| parent | fc77f530d7696e4272a9773f71a7cd181aa458d0 (diff) | |
| download | nextcloud-server-cc05aa2044eb96a34c92f892a6c3901729ca153e.tar.gz nextcloud-server-cc05aa2044eb96a34c92f892a6c3901729ca153e.zip | |
Merge pull request #18799 from nextcloud/fix/inheritedshares/no_link_shares
Do not show link shares in inherited list
Diffstat (limited to 'apps/files_sharing/lib/Controller')
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareAPIController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 7e6b3674b95..4893be25b20 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -222,12 +222,12 @@ class ShareAPIController extends OCSController { $group = $this->groupManager->get($share->getSharedWith()); $result['share_with'] = $share->getSharedWith(); $result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith(); - } else if ($share->getShareType() === Share::SHARE_TYPE_LINK) { + } else if ($share->getShareType() === IShare::TYPE_LINK) { // "share_with" and "share_with_displayname" for passwords of link // shares was deprecated in Nextcloud 15, use "password" instead. $result['share_with'] = $share->getPassword(); - $result['share_with_displayname'] = $share->getPassword(); + $result['share_with_displayname'] = '(' . $this->l->t('Shared link') . ')'; $result['password'] = $share->getPassword(); |