From 7f0e4421b35e6f0886e66559e4809bd5bf436425 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Wed, 26 Oct 2022 11:13:58 -0700 Subject: [PATCH] Fix invalid type of excludedFolderIds --- lib/Db/TimelineQueryDays.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php index 79f215ad..711f465e 100644 --- a/lib/Db/TimelineQueryDays.php +++ b/lib/Db/TimelineQueryDays.php @@ -215,10 +215,13 @@ trait TimelineQueryDays $topFolderId = $archiveFolder ? $archiveFolder->getId() : -1; } - return array_column($conn->executeQuery($cte, [ + return array_map('intval', array_column($conn->executeQuery($cte, [ 'topFolderId' => $topFolderId, 'excludedFolderIds' => $excludedFolderIds, - ])->fetchAll(), 'fileid'); + ], [ + 'topFolderId' => IQueryBuilder::PARAM_INT, + 'excludedFolderIds' => IQueryBuilder::PARAM_INT_ARRAY, + ])->fetchAll(), 'fileid')); } /** @@ -247,7 +250,6 @@ trait TimelineQueryDays } // Join with folder IDs - $folderIds = array_map('intval', $folderIds); $pathQuery = $query->expr()->in('f.parent', $query->createNamedParameter($folderIds, IQueryBuilder::PARAM_INT_ARRAY)); } else { // If getting non-recursively folder only check for parent