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/mail#41) "Preview as HTML" - Fix error with tracking urls #13956

Merged
merged 1 commit into from
Apr 18, 2019

Conversation

seamuslee001
Copy link
Contributor

@seamuslee001 seamuslee001 commented Apr 4, 2019

Overview

Fix regression in email preview. Use-case:

  • Compose a "Mailing => New Mailing"
  • Fill in basic in fields.
  • In the body of the mailing, include a hyperlink
  • Press the button "Preview as HTML"

This is an alternate version to #13813 based on Monish's comment at #13813 (comment)

Before

Fatal error generating trying to preview mailing

After

Preview works

ping @monishdeb @eileenmcnaughton @scardinius

@civibot
Copy link

civibot bot commented Apr 4, 2019

(Standard links)

@lcdservices
Copy link
Contributor

I tested this and confirmed it fixes the issue. This should probably be considered for a dot release, or at least the 5.13.0 release, as it's clearly a regression.

@seamuslee001 seamuslee001 changed the base branch from master to 5.13 April 17, 2019 20:50
@civibot civibot bot added 5.13 and removed master labels Apr 17, 2019
@seamuslee001
Copy link
Contributor Author

i've put this against 5.13 now based on Brian's comment ping @eileenmcnaughton @mattwire @monishdeb

@colemanw
Copy link
Member

This change looks good to me. Tagging merge-on-pass based on my code review and Brian's testing.
@seamuslee001 I'd also be happy to consider this for 5.12.2

@eileenmcnaughton
Copy link
Contributor

unrelated fail

@eileenmcnaughton eileenmcnaughton merged commit d1c5a34 into civicrm:5.13 Apr 18, 2019
@eileenmcnaughton eileenmcnaughton deleted the dev_mail_41 branch April 18, 2019 04:43
@totten totten changed the title dev/mail#41 Do not generate tracking urls if no mailing id has been p… dev/mail#41 Do not generate tracking urls if no mailing id has been passed in Apr 19, 2019
@totten totten changed the title dev/mail#41 Do not generate tracking urls if no mailing id has been passed in (dev/mail#41) "Preview as HTML" - Fix error with tracking urls Apr 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants