Fix for sms mode to skip on hold
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sun, 22 May 2022 22:13:40 +0000 (10:13 +1200)
committerEileen McNaughton <emcnaughton@wikimedia.org>
Sun, 22 May 2022 22:13:40 +0000 (10:13 +1200)
api/v3/Mailing.php

index a89cb0d471fd9cf6b10daf72534969813fa6d093..c7ec5be828233440b72d6018b1387e54b5456c9b 100644 (file)
@@ -554,11 +554,11 @@ function civicrm_api3_mailing_preview($params) {
   $mailingParams = ['contact_id' => $contactID];
 
   if (!$contactID) {
-    $details = CRM_Utils_Token::getAnonymousTokenDetails($mailingParams, $returnProperties, TRUE, TRUE, NULL, $mailing->getFlattenedTokens());
+    $details = CRM_Utils_Token::getAnonymousTokenDetails($mailingParams, $returnProperties, empty($mailing->sms_provider_id), TRUE, NULL, $mailing->getFlattenedTokens());
     $details = $details[0][0] ?? NULL;
   }
   else {
-    [$details] = CRM_Utils_Token::getTokenDetails($mailingParams, $returnProperties, TRUE, TRUE, NULL, $mailing->getFlattenedTokens());
+    [$details] = CRM_Utils_Token::getTokenDetails($mailingParams, $returnProperties, empty($mailing->sms_provider_id), TRUE, NULL, $mailing->getFlattenedTokens());
     $details = $details[$contactID];
   }