X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FEvent%2FBAO%2FBounce.php;h=130acf8e3c9925edeae2679a9a556624cf7d747a;hb=7811a84b72ab1b4f7d99b2ae31a502a8c36935eb;hp=c6f38080afef28c9e5c7687f9cf95fde15af5db0;hpb=f2a84e5c7c916f6c0d4c7fce69b844b019c17dd1;p=civicrm-core.git diff --git a/CRM/Mailing/Event/BAO/Bounce.php b/CRM/Mailing/Event/BAO/Bounce.php old mode 100644 new mode 100755 index c6f38080af..130acf8e3c --- a/CRM/Mailing/Event/BAO/Bounce.php +++ b/CRM/Mailing/Event/BAO/Bounce.php @@ -129,9 +129,7 @@ class CRM_Mailing_Event_BAO_Bounce extends CRM_Mailing_Event_DAO_Bounce { * @access public * @static */ - public static function getTotalCount($mailing_id, $job_id = NULL, - $is_distinct = FALSE - ) { + public static function getTotalCount($mailing_id, $job_id = NULL, $is_distinct = FALSE, $toDate = NULL) { $dao = new CRM_Core_DAO(); $bounce = self::getTableName(); @@ -150,6 +148,10 @@ class CRM_Mailing_Event_BAO_Bounce extends CRM_Mailing_Event_DAO_Bounce { ON $job.mailing_id = $mailing.id WHERE $mailing.id = " . CRM_Utils_Type::escape($mailing_id, 'Integer'); + if (!empty($toDate)) { + $query .= " AND $bounce.time_stamp <= $toDate"; + } + if (!empty($job_id)) { $query .= " AND $job.id = " . CRM_Utils_Type::escape($job_id, 'Integer'); } @@ -266,4 +268,3 @@ class CRM_Mailing_Event_BAO_Bounce extends CRM_Mailing_Event_DAO_Bounce { return $results; } } -