Skip to content

Commit 62403c7

Browse files
committed
fixup! Restrict query when searching for versions of trashbin files
1 parent 2d6a891 commit 62403c7

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

apps/files_trashbin/lib/Trashbin.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -936,12 +936,14 @@ private static function getVersionsFromTrash($filename, $timestamp, $user) {
936936
self::$scannedVersions = true;
937937
}
938938

939+
$pattern = \OC::$server->getDatabaseConnection()->escapeLikeParameter(basename($filename));
939940
if ($timestamp) {
940941
// fetch for old versions
941-
$pattern = basename($filename) . '.v%.d' . $timestamp;
942-
$offset = -strlen($timestamp) - 2;
942+
$escapedTimestamp = \OC::$server->getDatabaseConnection()->escapeLikeParameter($timestamp);
943+
$pattern .= '.v%.d' . $escapedTimestamp;
944+
$offset = -strlen($escapedTimestamp) - 2;
943945
} else {
944-
$pattern = basename($filename) . '.v%';
946+
$pattern .= '.v%';
945947
}
946948

947949
// Manually fetch all versions from the file cache to be able to filter them by their parent

0 commit comments

Comments
 (0)