Skip to content

check the actual query limit, not one adjusted for the folders count #18222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brandonkelly merged 3 commits into from
Jan 9, 2026
+3 −1
Merged

check the actual query limit, not one adjusted for the folders count #18222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ab2027
check the actual query limit, not one adjusted for the folders count
i-just Jan 8, 2026
801c9d8
Merge branch '4.x' into bugfix/18213-assets-index-and-50-folders
brandonkelly Jan 9, 2026
b78664b
Release note
brandonkelly Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Fixed a bug where all plugin settings were being saved to the project config, rather than just posted settings. ([craftcms/commerce#4006](https://github.com/craftcms/commerce/issues/4006))
- Fixed a bug where custom selects could be positioned incorrectly after the window was resized. ([#18179](https://github.com/craftcms/cms/issues/18179))
- Fixed an error that could occur when logging a deprecation warning, if the backtrace contained any non-UTF-8-encoded strings. ([#18218](https://github.com/craftcms/cms/issues/18218))
- Fixed a bug where it wasn’t possible to view assets if they had exactly 50 subfolders alongside them. ([#18213](https://github.com/craftcms/cms/issues/18213))
- Fixed SSRF vulnerabilities. (GHSA-96pq-hxpw-rgh8, GHSA-m5r2-8p9x-hp5m, GHSA-8jr8-7hr4-vhfx)
- Fixed a SQL injection vulnerability. (GHSA-2453-mppf-46cj)
- Fixed an XSS vulnerability. (GHSA-9f5h-mmq6-2x78)
Expand Down
3 changes: 2 additions & 1 deletion src/elements/Asset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,7 @@ protected static function prepElementQueryForTableAttribute(ElementQueryInterfac
protected static function indexElements(ElementQueryInterface $elementQuery, ?string $sourceKey): array
{
$assets = [];
$originalLimit = $elementQuery->limit;

// Include folders in the results?
/** @var AssetQuery $elementQuery */
Expand Down Expand Up @@ -726,7 +727,7 @@ protected static function indexElements(ElementQueryInterface $elementQuery, ?st
// return the folders directly
if (
self::isFolderIndex() ||
count($assets) === (int)$elementQuery->limit
count($assets) === (int)$originalLimit
) {
return $assets;
}
Expand Down