Pass a valid eager-loading handle

brandonkelly · brandonkelly · commit d6a31171e617 · 2024-05-14T17:00:37.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft CMS 5
 
+## Unreleased
+
+- Improved the performance of element indexes that contained asset thumbnails.
+
 ## 5.1.3 - 2024-05-14
 
 - Fixed a SQL error that could occur when applying or rebuilding the project config.
diff --git a/src/fields/Assets.php b/src/fields/Assets.php
@@ -494,7 +494,8 @@ public function getThumbHtml(mixed $value, ElementInterface $element, int $size)
     {
         /** @var AssetQuery|ElementCollection $value */
         if ($value instanceof AssetQuery) {
-            $value = (clone $value)->eagerly(__METHOD__);
+            $handle = sprintf('%s-%s', preg_replace('/:+/', '-', __METHOD__), $size);
+            $value = (clone $value)->eagerly($handle);
         }
 
         return $value->one()?->getThumbHtml($size);

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,8 @@ public function getThumbHtml(mixed $value, ElementInterface $element, int $size)`
`494`	`494`	`{`
`495`	`495`	`/** @var AssetQuery\|ElementCollection $value */`
`496`	`496`	`if ($value instanceof AssetQuery) {`
`497`		`- $value = (clone $value)->eagerly(__METHOD__);`
	`497`	`+ $handle = sprintf('%s-%s', preg_replace('/:+/', '-', __METHOD__), $size);`
	`498`	`+ $value = (clone $value)->eagerly($handle);`
`498`	`499`	`}`
`499`	`500`
`500`	`501`	`return $value->one()?->getThumbHtml($size);`