Skip to content

Commit

Permalink
Fix invalid type of excludedFolderIds
Browse files Browse the repository at this point in the history
  • Loading branch information
pulsejet committed Oct 26, 2022
1 parent e5c9f77 commit 7f0e442
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lib/Db/TimelineQueryDays.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,13 @@ private function getSubfolderIdsRecursive(
$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'));
}

/**
Expand Down Expand Up @@ -247,7 +250,6 @@ private function getFilecacheJoinQuery(
}

// 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
Expand Down

0 comments on commit 7f0e442

Please sign in to comment.