Skip to content

Commit 6f7fe63

Browse files
committed
fix: Make sure that rollback hook is triggered on all version backends
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent e0946a1 commit 6f7fe63

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

apps/files_versions/lib/Storage.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,6 @@ public static function rollback(string $file, int $revision, IUser $user) {
416416

417417
$node = $userFolder->get($file);
418418

419-
// TODO: move away from those legacy hooks!
420-
\OC_Hook::emit('\OCP\Versions', 'rollback', [
421-
'path' => $filename,
422-
'revision' => $revision,
423-
'node' => $node,
424-
]);
425419
return true;
426420
} elseif ($versionCreated) {
427421
self::deleteVersion($users_view, $version);

apps/files_versions/lib/Versions/VersionManager.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,13 @@ public function createVersion(IUser $user, FileInfo $file) {
9494

9595
public function rollback(IVersion $version) {
9696
$backend = $version->getBackend();
97-
return $backend->rollback($version);
97+
$result = $backend->rollback($version);
98+
\OC_Hook::emit('\OCP\Versions', 'rollback', [
99+
'path' => \OC\Files\Filesystem::getView()->getRelativePath($version->getSourceFile()->getPath()),
100+
'revision' => $version->getRevisionId(),
101+
'node' => $version->getSourceFile(),
102+
]);
103+
return $result;
98104
}
99105

100106
public function read(IVersion $version) {

0 commit comments

Comments
 (0)