Merge pull request #22874 from civicrm/mailing_token

Contact token should show contact's info instead of logged in contact
civicrm · Mar 3, 2022 · 83278f2 · 83278f2
2 parents b6191d9 + 4dff499
commit 83278f2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
@@ -2860,7 +2860,7 @@ public static function getContactMailingSelector(&$params) {
         CRM_Core_Action::VIEW => [
           'name' => ts('View'),
           'url' => 'civicrm/mailing/view',
-          'qs' => "reset=1&id=%%mkey%%",
+          'qs' => "reset=1&id=%%mkey%%&cid=%%cid%%&cs=%%cs%%",
           'title' => ts('View Mailing'),
           'class' => 'crm-popup',
         ],
@@ -2884,6 +2884,7 @@ public static function getContactMailingSelector(&$params) {
           'mid' => $values['mailing_id'],
           'cid' => $params['contact_id'],
           'mkey' => $mailingKey,
+          'cs' => CRM_Contact_BAO_Contact_Utils::generateChecksum($params['contact_id'], NULL, 'inf'),
         ],
         ts('more'),
         FALSE,