From ee027e3ba10c3e681337784fd29e1f9180d70746 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 17 Dec 2015 19:51:35 +0000 Subject: [PATCH] Jenkins fix --- CRM/Export/BAO/Export.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php index ddc0643f07..aa829d911e 100644 --- a/CRM/Export/BAO/Export.php +++ b/CRM/Export/BAO/Export.php @@ -203,9 +203,9 @@ class CRM_Export_BAO_Export { if ($queryMode & CRM_Contact_BAO_Query::MODE_ACTIVITY) { $groupBy = " GROUP BY civicrm_activity.id "; } - + $groupBy = !empty($groupBy) ? $groupBy : ''; - + return $groupBy; } @@ -240,17 +240,17 @@ class CRM_Export_BAO_Export { case CRM_Contact_BAO_Query::MODE_CASE: $extraReturnProperties = CRM_Case_BAO_Query::extraReturnProperties($queryMode); $paymentFields = FALSE; - $paymentTableID = ''; + $paymentTableId = ''; break; default: $paymentFields = FALSE; - $paymentTableID = ''; + $paymentTableId = ''; $extraReturnProperties = array(); } $extraProperties = array( 'paymentFields' => $paymentFields, - 'paymentTableID' => $paymentTableId, + 'paymentTableId' => $paymentTableId, 'extraReturnProperties' => $extraReturnProperties, ); return $extraProperties; @@ -458,7 +458,7 @@ class CRM_Export_BAO_Export { $extraProperties = self::defineExtraProperties($queryMode); $paymentFields = $extraProperties['paymentFields']; $extraReturnProperties = $extraProperties['extraReturnProperties']; - $paymentTableID = $extraProperties['paymentTableID']; + $paymentTableId = $extraProperties['paymentTableId']; if ($queryMode != CRM_Contact_BAO_Query::MODE_CONTACTS) { $componentReturnProperties = CRM_Contact_BAO_Query::defaultReturnProperties($queryMode); -- 2.25.1