Skip to content

[stable27] fix(files_versions): don't call getUid() on null #41553

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
solracsf merged 1 commit into from
Nov 16, 2023
Merged

[stable27] fix(files_versions): don't call getUid() on null #41553

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
Don't call getUid() on null 
Signed-off-by: Git'Fellow <[email protected]>
  • Loading branch information
@solracsf @backportbot-nextcloud
solracsf authored and backportbot-nextcloud[bot] committed Nov 16, 2023
commit 07c0223863bff0a1f29a3b5c80b018bc84bd1924
8 changes: 6 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 @@ -351,16 +351,20 @@ public function pre_renameOrCopy_hook(Node $source, Node $target): void {

/**
* Retrieve the path relative to the current user root folder.
* If no user is connected, use the node's owner.
* If no user is connected, try to use the node's owner.
*/
private function getPathForNode(Node $node): ?string {
try {
return $this->rootFolder
->getUserFolder(\OC_User::getUser())
->getRelativePath($node->getPath());
} catch (\Throwable $ex) {
$owner = $node->getOwner();
if ($owner === null) {
return null;
}
return $this->rootFolder
->getUserFolder($node->getOwner()->getUid())
->getUserFolder($owner->getUid())
->getRelativePath($node->getPath());
}
}
Expand Down