Remove good intentions

No - this isn't a todo we are about to do all of a sudden....

diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php
index 3846fd9e07921673bfdad2849031cb4aa6967c90..9669df0ff3a72d7190eb361608d65f8cd2fec90f 100644 (file)
--- a/CRM/Activity/Import/Parser.php
+++ b/CRM/Activity/Import/Parser.php
@@ -186,10 +186,6 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
       }
 
       if ($returnCode & self::DUPLICATE) {
-        if ($returnCode & self::MULTIPLE_DUPE) {
-          // TODO: multi-dupes should be counted apart from singles
-          // on non-skip action.
-        }
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
         if ($this->_haveColumnHeader) {

diff --git a/CRM/Contact/Import/Parser.php b/CRM/Contact/Import/Parser.php
index cc354036cbeda952776d3c273d8d3ddcbf3332ee..59068aa9504d5f4a5e93ba9d1ab4a0e9a24cd813 100644 (file)
--- a/CRM/Contact/Import/Parser.php
+++ b/CRM/Contact/Import/Parser.php
@@ -237,10 +237,6 @@ abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
       }
 
       if ($returnCode & self::DUPLICATE) {
-        if ($returnCode & self::MULTIPLE_DUPE) {
-          /* TODO: multi-dupes should be counted apart from singles
-           * on non-skip action */
-        }
         $this->_duplicateCount++;
         array_unshift($values, $this->_rowCount);
         $this->_duplicates[] = $values;

diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php
index 8a8ca3811251586b671a0740be4c50ca3c511d52..f08b2104422df24c67b206d986c7767eff4f4bc6 100644 (file)
--- a/CRM/Contribute/Import/Parser/Contribution.php
+++ b/CRM/Contribute/Import/Parser/Contribution.php
@@ -335,10 +335,6 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
       }
 
       if ($returnCode == self::DUPLICATE) {
-        if ($returnCode == self::MULTIPLE_DUPE) {
-          /* TODO: multi-dupes should be counted apart from singles
-           * on non-skip action */
-        }
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
         if ($this->_haveColumnHeader) {

diff --git a/CRM/Custom/Import/Parser.php b/CRM/Custom/Import/Parser.php
index 68036ecb96113785f1f5c1cc8302494cf621699d..91847a14725d840e15db54257dff850315b50e11 100644 (file)
--- a/CRM/Custom/Import/Parser.php
+++ b/CRM/Custom/Import/Parser.php
@@ -192,10 +192,6 @@ abstract class CRM_Custom_Import_Parser extends CRM_Import_Parser {
       }
 
       if ($returnCode & self::DUPLICATE) {
-        if ($returnCode & self::MULTIPLE_DUPE) {
-          /* TODO: multi-dupes should be counted apart from singles
-           * on non-skip action */
-        }
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
         if ($this->_haveColumnHeader) {

diff --git a/CRM/Event/Import/Parser.php b/CRM/Event/Import/Parser.php
index 59d464b41413d54430e7dc92f8c466846f66c68c..ee9f8ba179823172c090182f2e7a857a428b4ac2 100644 (file)
--- a/CRM/Event/Import/Parser.php
+++ b/CRM/Event/Import/Parser.php
@@ -195,10 +195,6 @@ abstract class CRM_Event_Import_Parser extends CRM_Import_Parser {
       }
 
       if ($returnCode & self::DUPLICATE) {
-        if ($returnCode & self::MULTIPLE_DUPE) {
-          /* TODO: multi-dupes should be counted apart from singles
-           * on non-skip action */
-        }
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
         if ($this->_haveColumnHeader) {

diff --git a/CRM/Member/Import/Parser.php b/CRM/Member/Import/Parser.php
index 7397d9a821dd3272093749ebc85d2b9a967fedd4..767fab7a04cc19a17cd6ece5194858b949c8fe72 100644 (file)
--- a/CRM/Member/Import/Parser.php
+++ b/CRM/Member/Import/Parser.php
@@ -197,10 +197,6 @@ abstract class CRM_Member_Import_Parser extends CRM_Import_Parser {
       }
 
       if ($returnCode & self::DUPLICATE) {
-        if ($returnCode & self::MULTIPLE_DUPE) {
-          /* TODO: multi-dupes should be counted apart from singles
-           * on non-skip action */
-        }
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
         array_unshift($values, $recordNumber);