Merge pull request #13284 from aydun/evaluate_fix

Prevent \Civi\Token\TokenCompatSubscriber::evaluate() erroring when no contactId is given.
civicrm · Jan 3, 2019 · fddfd6a · fddfd6a
2 parents 3e66a9d + d4afa03
commit fddfd6a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
@@ -49,6 +49,9 @@ public function onEvaluate(TokenValueEvent $e) {
     $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'])) {