Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#1123 - avoid possible variable name clash #15240

Merged

Conversation

demeritcowboy
Copy link
Contributor

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.

@civibot
Copy link

civibot bot commented Sep 7, 2019

(Standard links)

@civibot civibot bot added the 5.18 label Sep 7, 2019
@eileenmcnaughton
Copy link
Contributor

OK - but sigh. The other made more sense but i see your reasoning

@eileenmcnaughton eileenmcnaughton merged commit dc5fb9a into civicrm:5.18 Sep 7, 2019
@demeritcowboy demeritcowboy deleted the avoid-variable-name-conflict branch September 9, 2019 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants