From 8e7c199221ab55c8585bac873c782da67d406cd6 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 23 Aug 2022 15:20:15 +1200 Subject: [PATCH] Move isSkipDuplicates to shared parent --- CRM/Contact/Import/Form/MapField.php | 11 ----------- CRM/Import/Forms.php | 9 +++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index 8f7f958cf7..494011b3c2 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -440,17 +440,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { return ((int) $this->getSubmittedValue('onDuplicate')) === CRM_Import_Parser::DUPLICATE_NOCHECK; } - /** - * Did the user specify duplicates should be skipped and not imported. - * - * @return bool - * - * @throws \CRM_Core_Exception - */ - private function isSkipDuplicates(): bool { - return ((int) $this->getSubmittedValue('onDuplicate')) === CRM_Import_Parser::DUPLICATE_SKIP; - } - /** * Get the fields to be highlighted in the UI. * diff --git a/CRM/Import/Forms.php b/CRM/Import/Forms.php index 13801eb20b..b2772633a7 100644 --- a/CRM/Import/Forms.php +++ b/CRM/Import/Forms.php @@ -674,4 +674,13 @@ class CRM_Import_Forms extends CRM_Core_Form { return ((int) $this->getSubmittedValue('onDuplicate')) === CRM_Import_Parser::DUPLICATE_SKIP; } + /** + * Did the user specify duplicates should be skipped and not imported. + * + * @return bool + */ + protected function isSkipDuplicates(): bool { + return ((int) $this->getSubmittedValue('onDuplicate')) === CRM_Import_Parser::DUPLICATE_SKIP; + } + } -- 2.25.1