[5.x]: Restoring an Entry also restores nested Elements from prior versions

[ryansupercool]

What happened?

Description

When deleting and then restoring an Entry with a Matrix field, blocks from previous versions are also restored.

Steps to reproduce

1. Add a block (Block A) to a Matrix field and save.
2. Add another block (Block B) and save.
3. Delete Block B and save.
4. Delete the Entry.
5. Restore the Entry.

restore-nested.-entry.mov

Expected behavior

Only Block A should be present in the restored Entry.

Actual behavior

Only Block B is also restored when restoring the Entry.

Note this is in Craft the unreleased Craft 5.5, I'm not sure if this is expected or if something has changed from Craft 4 where only content from the latest revision would be restored.

Craft CMS version

5.5

PHP version

No response

Operating system and version

No response

Database type and version

No response

Image driver and version

No response

Installed plugins and versions

[brandonkelly]

Thanks for reporting that! I’ve fixed it for the next release. Unfortunately it won’t be fixed for any parent entries that were already deleted, though.

[brandonkelly]

Craft 5.5.0 is out with that fix. Thanks again!