Merge pull request #18079 from eileenmcnaughton/528

dev/core#1930 fix for move-related checkbox being overridden to true …
civicrm · Aug 6, 2020 · 2a96c7c · 2a96c7c
2 parents c2d2fa2 + ae57dda
commit 2a96c7c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
@@ -230,8 +230,8 @@ public function preProcess() {
 
       // add related table elements
       foreach ($rowsElementsAndInfo['rel_table_elements'] as $relTableElement) {
-        $element = $this->addElement($relTableElement[0], $relTableElement[1]);
-        $element->setChecked(TRUE);
+        $this->addElement($relTableElement[0], $relTableElement[1]);
+        $this->_defaults[$relTableElement[1]] = 1;
       }
 
       $this->assign('rel_tables', $rowsElementsAndInfo['rel_tables']);
@@ -414,4 +414,14 @@ protected function assignSummaryRowsToTemplate($contacts) {
     ]);
   }
 
+  /**
+   * Set the defaults for the form.
+   *
+   * @return array
+   *   Array of default values
+   */
+  public function setDefaultValues() {
+    return $this->_defaults;
+  }
+
 }