Fix public URL link with hashed URLs in mailing browse screen

civicrm · Jul 3, 2019 · 98b1a59 · 98b1a59
1 parent 950468d
commit 98b1a59
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/CRM/Mailing/Selector/Browse.php b/CRM/Mailing/Selector/Browse.php
@@ -444,7 +444,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
           $validLinks[CRM_Core_Action::BROWSE] = [
             'name' => ts('Public View'),
             'url' => 'civicrm/mailing/view',
-            'qs' => 'id=%%mid%%&reset=1',
+            'qs' => 'id=%%midOrHash%%&reset=1',
             'title' => ts('Public View'),
             'fe' => TRUE,
           ];
@@ -454,7 +454,10 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
         $rows[$key]['action'] = CRM_Core_Action::formLink(
           $validLinks,
           $actionMask,
-          ['mid' => $row['id']],
+          [
+            'mid' => $row['id'],
+            'midOrHash' => CRM_Mailing_BAO_Mailing::getMailingHash($row['id']) ? CRM_Mailing_BAO_Mailing::getMailingHash($row['id']) : $row['id'],
+          ],
           "more",
           FALSE,
           $opString,