CRM-21052 - Activity.create API - Abide by setting `civicaseActivityRevisions`

[civicrm-core.git] / api / v3 / MailingContact.php

diff --git a/api/v3/MailingContact.php b/api/v3/MailingContact.php
index b28f8bb0f6b6984e746dbaadd1159304ea7c3dd3..9d14e1030c401c9213277692e218fbd6df7551cb 100644 (file)
--- a/api/v3/MailingContact.php
+++ b/api/v3/MailingContact.php
@@ -159,11 +159,13 @@ GROUP BY   m.id
     }
     $select = implode(', ', $select);
 
-    $orderBy = 'ORDER BY j.start_date DESC';
+    $orderBy = 'ORDER BY MIN(j.start_date) DESC';
     if ($sort) {
       $orderBy = "ORDER BY $sort";
     }
 
+    $groupBy = CRM_Contact_BAO_Query::getGroupByFromSelectColumns(array_keys($fields), "m.id");
+
     $sql = "
 SELECT     $select
 FROM       civicrm_mailing m
@@ -174,7 +176,7 @@ INNER JOIN civicrm_mailing_event_queue meq ON meq.job_id = j.id
 WHERE      j.is_test = 0
 AND        meq.contact_id = %1
            $whereClause
-GROUP BY   m.id
+{$groupBy}
 {$orderBy}
 ";