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 #13276 from mfb/trash-change-log
[civicrm-core.git]
/
Civi
/
Token
/
TokenCompatSubscriber.php
diff --git
a/Civi/Token/TokenCompatSubscriber.php
b/Civi/Token/TokenCompatSubscriber.php
index 8e2ac735ba1b176cb5216da295183ec7733282b9..b4b41cfdab5b67ad65b28581ac31a6831d8b57f4 100644
(file)
--- a/
Civi/Token/TokenCompatSubscriber.php
+++ b/
Civi/Token/TokenCompatSubscriber.php
@@
-49,6
+49,9
@@
class TokenCompatSubscriber implements EventSubscriberInterface {
$messageTokens = $e->getTokenProcessor()->getMessageTokens();
foreach ($e->getRows() as $row) {
$messageTokens = $e->getTokenProcessor()->getMessageTokens();
foreach ($e->getRows() as $row) {
+ if (empty($row->context['contactId'])) {
+ continue;
+ }
/** @var int $contactId */
$contactId = $row->context['contactId'];
if (empty($row->context['contact'])) {
/** @var int $contactId */
$contactId = $row->context['contactId'];
if (empty($row->context['contact'])) {