Skip to content

Commit

Permalink
Merge pull request #1868 from nextcloud/backport/1862/stable30
Browse files Browse the repository at this point in the history
[stable30] fix(occ): handle share wrappers that do not have a circle
  • Loading branch information
ArtificialOwl authored Feb 18, 2025
2 parents 78d94ac + 95ceaf2 commit 4778b64
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions lib/Command/SharesFiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,20 @@ private function displayShares(
$sharedTo .= '@' . $recipient->getInstance();
}
}
$circle = $share->getCircle();
$circleField = '';
if ($share->hasCircle()) {
$circle = $share->getCircle();
$circleField = $circle->getDisplayName()
. ' (' . $share->getSharedWith()
. ', ' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
}
$row = [
$share->getId(),
$share->getFileSource(),
$share->getShareOwner(),
$share->getFileTarget(),
$share->getSharedBy(),
$circle->getDisplayName() . ' (' . $share->getSharedWith()
. ', ' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'
$circleField,
];

if (!$filterRecipient) {
Expand Down

0 comments on commit 4778b64

Please sign in to comment.