projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #11907 from mattwire/contribution_financialtype_fix
[civicrm-core.git]
/
CRM
/
Utils
/
Token.php
diff --git
a/CRM/Utils/Token.php
b/CRM/Utils/Token.php
index 44a649885882a2453150f85d1eafa832aa062228..e3bdcc102b9b02525450be95701a771271490733 100644
(file)
--- a/
CRM/Utils/Token.php
+++ b/
CRM/Utils/Token.php
@@
-1404,8
+1404,8
@@
class CRM_Utils_Token {
$greetingTokens = $remainingTokens;
reset($greetingTokens);
$greetingsReturnProperties = array();
$greetingTokens = $remainingTokens;
reset($greetingTokens);
$greetingsReturnProperties = array();
-
while (list($key) = each($greetingTokens)
) {
- $props = array_flip(
CRM_Utils_Array::value($key, $greetingTokens)
);
+
foreach ($greetingTokens as $value
) {
+ $props = array_flip(
$value
);
$props = array_fill_keys(array_keys($props), 1);
$greetingsReturnProperties = $greetingsReturnProperties + $props;
}
$props = array_fill_keys(array_keys($props), 1);
$greetingsReturnProperties = $greetingsReturnProperties + $props;
}
@@
-1762,6
+1762,7
@@
class CRM_Utils_Token {
'id' => $membership['membership_type_id'],
'return' => 'minimum_fee',
));
'id' => $membership['membership_type_id'],
'return' => 'minimum_fee',
));
+ $value = CRM_Utils_Money::format($value, NULL, NULL, TRUE);
}
catch (CiviCRM_API3_Exception $e) {
// we can anticipate we will get an error if the minimum fee is set to 'NULL' because of the way the
}
catch (CiviCRM_API3_Exception $e) {
// we can anticipate we will get an error if the minimum fee is set to 'NULL' because of the way the