projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2a7ed3
)
NFC Style fixes
author
John Kingsnorth
<john@johnkingsnorth.co.uk>
Thu, 1 Aug 2019 14:11:46 +0000
(15:11 +0100)
committer
GitHub
<noreply@github.com>
Thu, 1 Aug 2019 14:11:46 +0000
(15:11 +0100)
CRM/Utils/Token.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/Token.php
b/CRM/Utils/Token.php
index 5c4260ca7d336ecaa5e082e1093e90ec66beeb8e..9afa2e486fdfe24c9a6291dd275baf07a885a7da 100644
(file)
--- a/
CRM/Utils/Token.php
+++ b/
CRM/Utils/Token.php
@@
-1434,12
+1434,12
@@
class CRM_Utils_Token {
* @param array $greetingTokens
*/
private static function removeNullContactTokens(&$tokenString, $contactDetails, &$greetingTokens) {
-
+
// Only applies to contact tokens
if (!array_key_exists('contact', $greetingTokens)) {
return;
}
-
+
$greetingTokensOriginal = $greetingTokens;
$contactFieldList = CRM_Contact_DAO_Contact::fields();
// Sometimes contactDetails are in a multidemensional array, sometimes a