Excluded tags from trashed content #18164
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prerequisites
Fixes: #15524
Description
This PR backports the fix provided by @rammi987 in #15554.
I found in testing that PR that we didn't need the part around excluding unpublished content and it was sufficient to port over just the part relating to trashed content and media.
Other than the provided integration test, it can be reviewed using the following code added to a template:
And verifying that tagged content or media in the recycle bin aren't included in the displayed output.
I'll merge this one once the checks are happy as it's come from a community PR, so has already had two sets of eyes.