From ffb2a411209923b5103f5f918f767a008a7445bd Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 24 May 2022 16:01:02 +1200
Subject: [PATCH] Another always-true-if

---
 CRM/Contact/Import/Parser/Contact.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index bf2bb5853e..6a9ce7b8f1 100644
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -466,8 +466,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
     //format common data, CRM-4062
     $this->formatCommonData($params, $formatted, $contactFields);
 
-    $relationship = FALSE;
-
     //fixed CRM-4148
     //now we create new contact in update/fill mode also.
     $contactID = NULL;
@@ -499,7 +497,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
     }
 
     if (isset($newContact) && is_object($newContact) && ($newContact instanceof CRM_Contact_BAO_Contact)) {
-      $relationship = TRUE;
       $newContact = clone($newContact);
       $contactID = $newContact->id;
       $this->_newContacts[] = $contactID;
@@ -518,7 +515,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
         return CRM_Import_Parser::DUPLICATE;
       }
 
-      $relationship = TRUE;
       // CRM-10433/CRM-20739 - IDs could be string or array; handle accordingly
       if (!is_array($dupeContactIDs = $newContact['error_message']['params'][0])) {
         $dupeContactIDs = explode(',', $dupeContactIDs);
@@ -550,7 +546,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
       CRM_Utils_Hook::import('Contact', 'process', $this, $hookParams);
     }
 
-    if ($relationship) {
+    if (1) {
       $primaryContactId = NULL;
       if (CRM_Core_Error::isAPIError($newContact, CRM_Core_ERROR::DUPLICATE_CONTACT)) {
         if ($dupeCount == 1 && CRM_Utils_Rule::integer($contactID)) {
-- 
2.25.1