Skip to content

[stable28] Improve path resolution in files_version hooks #42921

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 1 commit into from
Jan 18, 2024
Merged

[stable28] Improve path resolution in files_version hooks #42921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Improve path resolution in files_version hooks 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge @backportbot-nextcloud
artonge authored and backportbot-nextcloud[bot] committed Jan 18, 2024
commit eaddf3601252b9eeee3e25df6d26e6f3a867d897
12 changes: 10 additions & 2 deletions apps/files_versions/lib/Listener/FileEventsListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,16 +350,24 @@ public function pre_renameOrCopy_hook(Node $source, Node $target): void {
private function getPathForNode(Node $node): ?string {
$user = $this->userSession->getUser()?->getUID();
if ($user) {
return $this->rootFolder
$path = $this->rootFolder
->getUserFolder($user)
->getRelativePath($node->getPath());

if ($path !== null) {
return $path;
}
}

$owner = $node->getOwner()?->getUid();
if ($owner) {
return $this->rootFolder
$path = $this->rootFolder
->getUserFolder($owner)
->getRelativePath($node->getPath());

if ($path !== null) {
return $path;
}
}

return null;
Expand Down