Skip to content
This repository has been archived by the owner on Feb 6, 2023. It is now read-only.

Fix [#17] Mailing job ID can not be retrieved for hook_civicrm_tokenValues() implementations. #18

Merged
merged 1 commit into from
Oct 7, 2018

Conversation

jensschuppe
Copy link
Contributor

No description provided.

@civicrm-builder
Copy link

Can one of the admins verify this patch?

@seamuslee001
Copy link
Contributor

Jenkins ok to test

@totten totten merged commit ac8d3e1 into civicrm:master Oct 7, 2018
@totten
Copy link
Member

totten commented Oct 7, 2018

Thank you, @jensschuppe.

In reviewing this, I found that there was also a patch in civicrm/civicrm-core#12026 which was merged into civicrm-core v5.6. It addresses the same problem (i.e. mis-match in the name of the fields passed-around), but it goes the opposite way (e.g. standardizing on mailingJobId instead of mailingJob).

Overall, I think it's slightly more maintainable to pass the MailingJob ID instead of the MailingJob DAO. (There's more implicit-coupling when someone uses the DAO.) Regardless, this technique still seems useful for compatibility with <=5.5. So I merged manually and included a revision a901e6a to use it as a short-term fix.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants