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

CRM-18465: fully resolve contributions before resolving tokens #8222

Merged
merged 2 commits into from
May 19, 2016

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Apr 24, 2016

@monishdeb monishdeb changed the title CRM-18465 fully resolve contributions before resolving tokens CRM-18465: fully resolve contributions before resolving tokens May 13, 2016
$messageToken,
$task
);
$contacts[$contactID] = array_merge($tokenResolvedContacts[0][$contactID], $contact);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that would be $tokenResolvedContacts[$contactID] as per the earlier change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@monishdeb I checked & the $tokenResolvedContacts does have that extra layer for some reason. I added a unit test to demonstrate it working (& lock it in)

@monishdeb
Copy link
Member

Cool ... nice work :)

@monishdeb
Copy link
Member

Tested works fine

@monishdeb monishdeb merged commit 3f699c2 into civicrm:master May 19, 2016
@monishdeb monishdeb deleted the CRM-18465 branch May 19, 2016 09:28
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