From ccd2609636a6fb19b6421566171b33f42287f441 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Oct 2019 15:40:06 +1300
Subject: [PATCH] Remove IF as always true

---
 CRM/Dedupe/Merger.php | 48 +++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index e513265d80..5cdab873af 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1095,34 +1095,32 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
       $rows["move_$field"]['other'] = self::getFieldValueAndLabel($field, $other)['label'];
 
       foreach (['other' => $other] as $moniker => $contact) {
-        if ($moniker == 'other') {
-          $value = self::getFieldValueAndLabel($field, $other)['value'];
-          //CRM-14334
-          if ($value === NULL || $value == '') {
-            $value = 'null';
-          }
-          if ($value === 0 or $value === '0') {
-            $value = $qfZeroBug;
-          }
-          if (is_array($value) && empty($value[1])) {
-            $value[1] = NULL;
-          }
+        $value = self::getFieldValueAndLabel($field, $other)['value'];
+        //CRM-14334
+        if ($value === NULL || $value == '') {
+          $value = 'null';
+        }
+        if ($value === 0 or $value === '0') {
+          $value = $qfZeroBug;
+        }
+        if (is_array($value) && empty($value[1])) {
+          $value[1] = NULL;
+        }
 
-          // Display a checkbox to migrate, only if the values are different
-          if ($value != $main[$field]) {
-            $elements[] = [
-              'advcheckbox',
-              "move_$field",
-              NULL,
-              NULL,
-              NULL,
-              $value,
-            ];
-          }
+        // Display a checkbox to migrate, only if the values are different
+        if ($value != $main[$field]) {
+          $elements[] = [
+            'advcheckbox',
+            "move_$field",
+            NULL,
+            NULL,
+            NULL,
+            $value,
+          ];
+        }
 
-          $migrationInfo["move_$field"] = $value;
+        $migrationInfo["move_$field"] = $value;
         }
-      }
       $rows["move_$field"]['title'] = $fields[$field]['title'];
     }
 
-- 
2.25.1