Skip to content

[stable26] fix(sharing): set name to target name in sharing cache #41071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Dec 7, 2023
Merged

[stable26] fix(sharing): set name to target name in sharing cache #41071

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6422d1a
fix(sharing): set name to target name in sharing cache
max-nextcloud Sep 19, 2023
4d36a07
test(files_sharing): Test if recent files result use actual share tar…
juliusknorr Oct 18, 2023
e65680c
pass the share to the cache instead of having to ask the storage
icewind1991 Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(sharing): set name to target name in sharing cache 
Fixes #39879.

Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud @juliusknorr
max-nextcloud authored and juliusknorr committed Dec 7, 2023
commit 6422d1aaf01c8605754dfb098771683162d0630f
4 changes: 4 additions & 0 deletions apps/files_sharing/lib/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ protected function formatCacheEntry($entry, $path = null) {
} else {
$entry['permissions'] = $this->storage->getPermissions($entry['path']);
}

if ($this->share->getNodeId() === $entry['fileid']) {
$entry['name'] = basename($this->share->getTarget());
}
} catch (StorageNotAvailableException $e) {
// thrown by FailedStorage e.g. when the sharer does not exist anymore
// (IDE may say the exception is never thrown – false negative)
Expand Down