diff options
author | Louis <louis@chmn.me> | 2023-11-16 15:57:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-16 15:57:20 +0100 |
commit | 1b18b976b45b155f005676640e0d49ca7830b8b0 (patch) | |
tree | 28aa84ce90718a058e196985c8a37cd95a45402f | |
parent | 7b45939561051b761822190e9b609f0998eb7640 (diff) | |
parent | 652317e3e2c69126bf96eb668f1e38849964ccc8 (diff) | |
download | nextcloud-server-1b18b976b45b155f005676640e0d49ca7830b8b0.tar.gz nextcloud-server-1b18b976b45b155f005676640e0d49ca7830b8b0.zip |
Merge pull request #41518 from nextcloud/nullGetUid
fix(files_versions): don't call getUid() on null
-rw-r--r-- | apps/files_versions/lib/Listener/FileEventsListener.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/files_versions/lib/Listener/FileEventsListener.php b/apps/files_versions/lib/Listener/FileEventsListener.php index d90283bacc8..323b92b3920 100644 --- a/apps/files_versions/lib/Listener/FileEventsListener.php +++ b/apps/files_versions/lib/Listener/FileEventsListener.php @@ -351,7 +351,7 @@ class FileEventsListener implements IEventListener { /** * 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 { @@ -359,8 +359,12 @@ class FileEventsListener implements IEventListener { ->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()); } } |