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/#/258 Fix message update routine. #12492

Merged
merged 1 commit into from
Jul 18, 2018

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Jul 17, 2018

Overview

5.4 unreleased regression - customised message templates being overwritten

https://lab.civicrm.org/dev/core/issues/258

Before

  1. customise Contributions - Receipt (on-line) on a 5.3 install
  2. upgrade to 5.4
  3. note the customised msg_template is updated (and the reserved one is)

After

  1. customise Contributions - Receipt (on-line) on a 5.3 install
  2. upgrade to 5.4
  3. note the customised msg_template is not updated (but the reserved one is)

Technical Details

The test class was misnamed leading to it being deemed to be 'working' when it was not actually running :-(. Other changes are because further templates were added to the 5.4 update after this

Comments

For background prior to 5.4 we didn't ship the xml directory and updates to message templates required a lot of work for the reviewer as the tpl was copied to the install dir where the diff could not be easily viewed. Unfortunately the new mechanism had a bug

Turns out this was seeming to pass but not because the test wasn't running.
@civibot
Copy link

civibot bot commented Jul 17, 2018

(Standard links)

@homotechsual
Copy link
Contributor

I've tested this out today, starting with Civi 5.3 customising the tpl, updating to 5.4 and confirming that the tpl is updated then reverting and updating to 5.4 with the PR applied and confirming that the customised TPL is no longer updated.

@eileenmcnaughton this works as described.

@eileenmcnaughton
Copy link
Contributor Author

Huge thanks @MikeyMJCO

@eileenmcnaughton eileenmcnaughton merged commit d92edef into civicrm:5.4 Jul 18, 2018
@eileenmcnaughton eileenmcnaughton deleted the msg_fix branch July 18, 2018 22:03
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.

3 participants