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

Format token custom fields with value of 0 correctly #13282

Merged
merged 1 commit into from
Jan 3, 2019

Conversation

aydun
Copy link
Contributor

@aydun aydun commented Dec 14, 2018

Overview

Extracted from #13174 and #12012 Small bug fix so that tokens for custom values of 0 get formatted

@civibot
Copy link

civibot bot commented Dec 14, 2018

(Standard links)

@civibot civibot bot added the master label Dec 14, 2018
@seamuslee001
Copy link
Contributor

Jenkins re test this please

@mattwire
Copy link
Contributor

mattwire commented Jan 3, 2019

Switches from directly checking the field value via an if statement (where 0 evaluates to FALSE) to using isset() where 0 evaluates to TRUE. If the field value is NULL it will not be formatted which is ok.

@seamuslee001 @eileenmcnaughton Could one of you merge?

@seamuslee001
Copy link
Contributor

Merging based on @mattwire 's review

@seamuslee001 seamuslee001 merged commit 3e66a9d into civicrm:master Jan 3, 2019
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