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 #11732 from twomice/CRM-21811_optimize_search_reciprocal_relations...
[civicrm-core.git]
/
CRM
/
Utils
/
Token.php
diff --git
a/CRM/Utils/Token.php
b/CRM/Utils/Token.php
index 44a649885882a2453150f85d1eafa832aa062228..d879d6f697bb4aebaae1243eda95cae331773538 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;
}