Skip to content

Commit ae97c56

Browse files
committed
Merge branch '4.x' of https://github.com/craftcms/cms into 5.x
# Conflicts: # CHANGELOG.md
2 parents c097885 + b95c888 commit ae97c56

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- 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))
88
- Fixed a bug where custom selects could be positioned incorrectly after the window was resized. ([#18179](https://github.com/craftcms/cms/issues/18179))
99
- 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))
10+
- 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))
1011
- Fixed a bug where Matrix fields’ Entry Types settings were partially interactive when admin changes were disallowed. ([#18145](https://github.com/craftcms/cms/pull/18145))
1112
- Fixed a bug where users could be unable to sign in if an inactive user account existed with the same email address. ([#18148](https://github.com/craftcms/cms/issues/18148))
1213
- Fixed a bug where Content Block fields could appear to be missing their content when viewing a revision. ([#18149](https://github.com/craftcms/cms/issues/18149))

src/elements/Asset.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,7 @@ public static function attributePreviewHtml(array $attribute): mixed
741741
protected static function indexElements(ElementQueryInterface $elementQuery, ?string $sourceKey): array
742742
{
743743
$assets = [];
744+
$originalLimit = $elementQuery->limit;
744745

745746
// Include folders in the results?
746747
/** @var AssetQuery $elementQuery */
@@ -819,7 +820,7 @@ protected static function indexElements(ElementQueryInterface $elementQuery, ?st
819820
// return the folders directly
820821
if (
821822
self::isFolderIndex() ||
822-
count($assets) === (int)$elementQuery->limit
823+
count($assets) === (int)$originalLimit
823824
) {
824825
return $assets;
825826
}

0 commit comments

Comments
 (0)