diff options
Diffstat (limited to 'apps/files_versions/lib')
| -rw-r--r-- | apps/files_versions/lib/Sabre/VersionRoot.php | 6 | ||||
| -rw-r--r-- | apps/files_versions/lib/Storage.php | 6 | ||||
| -rw-r--r-- | apps/files_versions/lib/Versions/LegacyVersionsBackend.php | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/apps/files_versions/lib/Sabre/VersionRoot.php b/apps/files_versions/lib/Sabre/VersionRoot.php index 69ac12ed8e9..2ae1bf04203 100644 --- a/apps/files_versions/lib/Sabre/VersionRoot.php +++ b/apps/files_versions/lib/Sabre/VersionRoot.php @@ -75,14 +75,12 @@ class VersionRoot implements ICollection { $userFolder = $this->rootFolder->getUserFolder($this->user->getUID()); $fileId = (int)$name; - $nodes = $userFolder->getById($fileId); + $node = $userFolder->getFirstNodeById($fileId); - if ($nodes === []) { + if (!$node) { throw new NotFound(); } - $node = array_pop($nodes); - if (!$node instanceof File) { throw new NotFound(); } diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index 07bd6b164d2..a35f151d956 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -209,9 +209,9 @@ class Storage { $mount = $file->getMountPoint(); if ($mount instanceof SharedMount) { $ownerFolder = $rootFolder->getUserFolder($mount->getShare()->getShareOwner()); - $ownerNodes = $ownerFolder->getById($file->getId()); - if (count($ownerNodes)) { - $file = current($ownerNodes); + $ownerNode = $ownerFolder->getFirstNodeById($file->getId()); + if ($ownerNode) { + $file = $ownerNode; $uid = $mount->getShare()->getShareOwner(); } } diff --git a/apps/files_versions/lib/Versions/LegacyVersionsBackend.php b/apps/files_versions/lib/Versions/LegacyVersionsBackend.php index a6bf6c2cb1a..4c365ed4c14 100644 --- a/apps/files_versions/lib/Versions/LegacyVersionsBackend.php +++ b/apps/files_versions/lib/Versions/LegacyVersionsBackend.php @@ -87,8 +87,7 @@ class LegacyVersionsBackend implements IVersionBackend, INameableVersionBackend, $userFolder = $this->rootFolder->getUserFolder($user->getUID()); - $nodes = $userFolder->getById($fileId); - $file = array_pop($nodes); + $file = $userFolder->getFirstNodeById($fileId); if (!$file) { throw new NotFoundException("version file not found for share owner"); |