UPSTREAM FIX

magento2-39681: AddMediaGalleryData runs getSize on an already loaded product collection

Community fix magento2-39681 merged into magento/magento2 on 2025-04-16, released in 2.4.9; applies cleanly to 33 releases from 2.4.6 to 2.4.8-p5.

addMediaGalleryData runs getSize on an already loaded product collection edited

Pull request title
Product Collection - addMediaGalleryData calls getSize when the collection maybe or will be loaded (Can use count to avoid an extra DB query)
Pull request
magento/magento2#39681
Issues
#39111 human
Author
@Himsoft
Merged
2025-04-16
Fixed in
2.4.9
Reported on
—
Categories
Catalog/Product
Components
magento/module-catalog

Labels

Area
Product
Component
MediaGallery
Priority
P2
Severity
—
Reported on (labels)
2.4.x

Issue

Title and steps come from the upstream issue and pull request.

Description

getSize is called on a loaded paginated collection to check if it has data.

Steps to reproduce

1. Enable dev query log
1. This should be reproducible by calling the products GQL call with the media*gallery/media_gallery*entries field selected.
1. The count call should be in the query log, traced to addMediaGalleryData

Expected result

getSize is not called on a loaded product collection. (When the non-paginated count is not needed).

Actual result

getSize is called on a loaded paginated collection to check if it has data.

Taken from the upstream issue.

Code match per tag

Each tag was checked with git apply --check against that tag's files. A clean match means the change applies; it is not a test result. Tags that already contain the fix are marked.

LineCode match per tagTests
2.4.6
2.4.6 clean 2.4.6-p1 clean 2.4.6-p2 clean 2.4.6-p3 clean 2.4.6-p4 clean 2.4.6-p5 clean 2.4.6-p6 clean 2.4.6-p7 clean 2.4.6-p8 clean 2.4.6-p9 clean 2.4.6-p10 clean 2.4.6-p11 clean 2.4.6-p12 clean 2.4.6-p13 clean 2.4.6-p14 clean 2.4.6-p15 clean
2.4.6: no test data 2.4.6-p1: no test data 2.4.6-p2: no test data 2.4.6-p3: no test data 2.4.6-p4: no test data 2.4.6-p5: no test data 2.4.6-p6: no test data 2.4.6-p7: no test data 2.4.6-p8: no test data 2.4.6-p9: no test data 2.4.6-p10: no test data 2.4.6-p11: no test data 2.4.6-p12: no test data 2.4.6-p13: no test data 2.4.6-p14: no test data 2.4.6-p15: no test data
2.4.7
2.4.7 clean 2.4.7-p1 clean 2.4.7-p2 clean 2.4.7-p3 clean 2.4.7-p4 clean 2.4.7-p5 clean 2.4.7-p6 clean 2.4.7-p7 clean 2.4.7-p8 clean 2.4.7-p9 clean 2.4.7-p10 clean
2.4.7: no test data 2.4.7-p1: no test data 2.4.7-p2: no test data 2.4.7-p3: no test data 2.4.7-p4: no test data 2.4.7-p5: no test data 2.4.7-p6: no test data 2.4.7-p7: no test data 2.4.7-p8: no test data 2.4.7-p9: no test data 2.4.7-p10: fails before, passes afterunit: fails before, passes after
2.4.8
2.4.8 clean 2.4.8-p1 clean 2.4.8-p2 clean 2.4.8-p3 clean 2.4.8-p4 clean 2.4.8-p5 clean
2.4.8: no test data 2.4.8-p1: no test data 2.4.8-p2: no test data 2.4.8-p3: no test data 2.4.8-p4: no test data 2.4.8-p5: fails before, passes afterunit: fails before, passes after
2.4.9
2.4.9 conflictcontains the fix
2.4.9: no test data

Triage

Model @cf/cloudflare/clef. Probability this is a bug fix: 87.6%. Probability it is security relevant: 0.6%.

Show the model's answers and probabilities
QuestionAnswerProbabilitiesConfidence
Change kindbugfixbugfix 89.7%, refactor 6.7%, tests_only 1.5%, feature 1.0%, dependency 0.6%, docs_only 0.5%77.2%
Areacatalogcatalog 68.6%, graphql_api 24.1%, framework 1.6%46.3%
Reported versionunspecifiedunspecified 41.0%, 2.4.4 1.5%, 2.4.6 1.4%16.3%
Scope0.58 of 20 48.2%, 1 46.1%, 2 5.7%17.2%
Risk0.21 of 20 82.3%, 1 14.2%, 2 3.5%54.7%
Worth backporting0.96 of 21 36.9%, 0 33.6%, 2 29.6%0.4%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-39681/ folder into patches/composer/, merge composer.patches.json into composer.json, then run composer install. Test files are always removed; paths are relative to each package root, using the default -p1 level.

Packages (1): magento/module-catalog
Bundle README (what the ZIP ships)
# magento2-39681

Community fix merged upstream into magento/magento2, adapted by magento.watch.
This is not a patch published by Adobe.

Pull request: https://github.com/magento/magento2/pull/39681
Issue: https://github.com/magento/magento2/issues/39111
Author: @Himsoft
Source commit: fb61e3b1676ffa5c311bf52057b8ce7cc834d6cf
Modifications: test files and documentation removed, paths rewritten relative to each Composer package.
Licence: OSL-3.0 / AFL-3.0, as the original Magento Open Source code.
Maintainer: Łukasz Bajsarowicz (@lbajsarowicz)

Licence: Magento Open Source code under OSL-3.0 and AFL-3.0. The bundle carries the original author, source commit and the list of modifications.

Sources

Łukasz Bajsarowicz
Built by

Łukasz Bajsarowicz, e-commerce architect

Magento and Adobe Commerce architecture, upgrades, performance and audits for merchants and agencies since 2015; magento.watch is the tooling I use on those projects.

Open source, maintained on weekends.