dev/core#1123 - avoid possible variable name clash #15240
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.
Overview
As per the comment at #15147 (comment) this avoids a possible smarty variable name clash with files that might get
{include}
'd, especially for custom activity types that have their custom templates automatically included. The variable name 'activityType' might be too common.Comments
Putting against 5.18 because I meant to get to it earlier but was too slow and it got branched before I got to it.