Merge pull request #3023 from nextcloud/backport/3022/stable28

[stable28] fix: Get Proper Node object when creating GroupVersion
nextcloud · Jun 21, 2024 · ecdc0c5 · ecdc0c5
2 parents f711294 + 62d34f1
commit ecdc0c5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/Versions/VersionsBackend.php b/lib/Versions/VersionsBackend.php
@@ -137,12 +137,18 @@ private function getVersionsForFileFromDB(FileInfo $fileInfo, IUser $user, int $
 		/** @var Folder */
 		$folder = $this->appFolder->get((string)$folderId);
 		$file = $folder->get($fileInfo->getInternalPath());
+		/** @var Folder */
+		$groupFolder = $this->rootFolder->get('/__groupfolders/' . $folderId);
 
 		$versionEntities = $this->groupVersionsMapper->findAllVersionsForFileId($fileInfo->getId());
 		$mappedVersions = array_map(
-			function (GroupVersionEntity $versionEntity) use ($versionsFolder, $mountPoint, $file, $fileInfo, $user, $folderId) {
+			function (GroupVersionEntity $versionEntity) use ($versionsFolder, $mountPoint, $file, $fileInfo, $user, $folderId, $groupFolder) {
 				if ($fileInfo->getMtime() === $versionEntity->getTimestamp()) {
-					$versionFile = $file;
+					if ($fileInfo instanceof File) {
+						$versionFile = $fileInfo;
+					} else {
+						$versionFile = $groupFolder->get($fileInfo->getInternalPath());
+					}
 				} else {
 					try {
 						$versionFile = $versionsFolder->get((string)$versionEntity->getTimestamp());