From bdc6e6ee560ceafd5132d2e0151d4d86a39e04c1 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Oct 2019 15:42:37 +1300
Subject: [PATCH] Remove for-each as silly

---
 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 5cdab873af..339338bf2a 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1094,33 +1094,31 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
       $rows["move_$field"]['main'] = self::getFieldValueAndLabel($field, $main)['label'];
       $rows["move_$field"]['other'] = self::getFieldValueAndLabel($field, $other)['label'];
 
-      foreach (['other' => $other] as $moniker => $contact) {
-        $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