Skip to content

Commit b67a437

Browse files
authored
Merge pull request #52694 from nextcloud/fixHardcodedVersionsFolder
fix(files_versions): Folder should not be hardcoded
2 parents 0f03a89 + 1b549d4 commit b67a437

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

apps/files_versions/lib/Versions/LegacyVersionsBackend.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,16 +367,20 @@ public function importVersionsForFile(IUser $user, Node $source, Node $target, a
367367
* @inheritdoc
368368
*/
369369
public function clearVersionsForFile(IUser $user, Node $source, Node $target): void {
370-
$userFolder = $this->rootFolder->getUserFolder($user->getUID());
370+
$userId = $user->getUID();
371+
$userFolder = $this->rootFolder->getUserFolder($userId);
371372

372373
$relativePath = $userFolder->getRelativePath($source->getPath());
373374
if ($relativePath === null) {
374375
throw new Exception('Relative path not found for node with path: ' . $source->getPath());
375376
}
376377

377-
$versions = Storage::getVersions($user->getUID(), $relativePath);
378-
/** @var Folder versionFolder */
379-
$versionFolder = $this->rootFolder->get('admin/files_versions');
378+
$versionFolder = $this->rootFolder->get($userId . '/files_versions');
379+
if (!$versionFolder instanceof Folder) {
380+
throw new Exception('User versions folder does not exist');
381+
}
382+
383+
$versions = Storage::getVersions($userId, $relativePath);
380384
foreach ($versions as $version) {
381385
$versionFolder->get($version['path'] . '.v' . (int)$version['version'])->delete();
382386
}

0 commit comments

Comments
 (0)