UPSTREAM FIX

magento2-39680: Re-added product image gets the roles of the previously removed image

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

Re-added product image gets the roles of the previously removed image edited

Pull request title: Completely removing a gallery-image from be keeps scope roles/types set (base/small/thumbnail) and after re-adding "old" roles/types appear
Pull request: magento/magento2#39680
Issues: #39481 human
Author: @pavel77718
Merged: 2025-06-26
Fixed in: 2.4.9
Reported on: 2.4.7
Categories: —
Components: magento/module-catalog

Labels

Area: Content / CMS
Component: Image
Priority: P3
Severity: —
Reported on (labels): 2.4.7

Issue

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

Description

- if we previously removed the "base" type/role in a specific store-view, even if the image was completely removed from the gallery, after re-adding the image now in the specific store-scope the type/roles are the ones of the old (removed) image instead the ones of the default image (we expected inheritance)

Steps to reproduce

- add a simple product
- add an image in the default scope and select "base" type/role
- make sure the type/role has been inherited by the store-scopes
- remove or change types/roles in a store_view scope (i.e. remove the "base" type/role)
- completely remove the gallery image (from scopes and from default)
- re-add a new image in the default scope and flag the type/role "base"

Expected result

- in the store scopes the images inherit the roles/types of the new added image as per the default scope

Actual result

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.

Line	Code match per tag	Tests
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: no test data
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: no test data
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: 98.0%. Probability it is security relevant: 0.6%.

Show the model's answers and probabilities

Question	Answer	Probabilities	Confidence
Change kind	bugfix	bugfix 97.3%, refactor 0.9%, feature 0.5%, tests_only 0.5%, docs_only 0.4%, dependency 0.4%	93.7%
Area	admin	admin 50.3%, catalog 43.3%, frontend 4.4%	36.3%
Reported version	2.4.7	2.4.7 57.9%, 2.4.7-p1 2.9%, 2.4.7-p10 1.2%	33.0%
Scope	0.42 of 2	0 65.0%, 1 28.1%, 2 6.8%	26.0%
Risk	0.45 of 2	0 57.5%, 1 40.1%, 2 2.4%	23.8%
Worth backporting	1.55 of 2	2 65.0%, 1 24.7%, 0 10.3%	24.1%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-39680/ 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.

Bundle README (what the ZIP ships)

# magento2-39680

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/39680
Issue: https://github.com/magento/magento2/issues/39481
Author: @pavel77718
Source commit: 2596dd4b6e6bccee95408aca03346abf6040aff4
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.