From d7860c237e96210b15c033e2e3336da2b64508c9 Mon Sep 17 00:00:00 2001 From: Allen Shaw Date: Tue, 13 Jun 2017 11:19:18 -0500 Subject: [PATCH] CRM-20660: minor code cleanup. --- CRM/Report/Form/Mailing/Summary.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CRM/Report/Form/Mailing/Summary.php b/CRM/Report/Form/Mailing/Summary.php index 9ff9add70f..c5373ed425 100644 --- a/CRM/Report/Form/Mailing/Summary.php +++ b/CRM/Report/Form/Mailing/Summary.php @@ -358,7 +358,7 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { // is the key in $this->_columns, and $fieldName is the key in that array's // ['fields'] array. // Reference: CRM-20660 - $distinct_count_columns = array( + $distinctCountColumns = array( 'civicrm_mailing_event_queue.queue_count', 'civicrm_mailing_event_delivered.delivered_count', 'civicrm_mailing_event_bounce.bounce_count', @@ -393,12 +393,10 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { if (in_array($tableName, $count_tables)) { // Use the DISTINCT keyword appropriately, based on the contents // of $distinct_count_columns. - if (in_array("{$tableName}.{$fieldName}", $distinct_count_columns)) { + $distinct = ''; + if (in_array("{$tableName}.{$fieldName}", $distinctCountColumns)) { $distinct = 'DISTINCT'; } - else { - $distinct = ''; - } $select[] = "count($distinct {$field['dbAlias']}) as {$tableName}_{$fieldName}"; } else { -- 2.25.1