Merge pull request #18899 from seamuslee001/composer_2x

[civicrm-core.git] / CRM / Contact / Form / Merge.php

diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
index ddea89ac896a2477f668634d4084e8af09cb7e92..be4c5894a9d13163d438b1156d5e899dc5435efc 100644 (file)
--- a/CRM/Contact/Form/Merge.php
+++ b/CRM/Contact/Form/Merge.php
@@ -229,9 +229,9 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
       }
 
       // add related table elements
-      foreach ($rowsElementsAndInfo['rel_table_elements'] as $relTableElement) {
-        $element = $this->addElement($relTableElement[0], $relTableElement[1]);
-        $element->setChecked(TRUE);
+      foreach (array_keys($rowsElementsAndInfo['rel_tables']) as $relTableElement) {
+        $this->addElement('checkbox', $relTableElement);
+        $this->_defaults[$relTableElement] = 1;
       }
 
       $this->assign('rel_tables', $rowsElementsAndInfo['rel_tables']);
@@ -376,7 +376,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
       CRM_Utils_System::permissionDenied();
     }
     // ensure that oid is not the current user, if so refuse to do the merge
-    if (CRM_Core_Session::singleton()->getLoggedInContactID() == $oid) {
+    if (CRM_Core_Session::getLoggedInContactID() == $oid) {
       $message = ts('The contact record which is linked to the currently logged in user account - \'%1\' - cannot be deleted.',
         [1 => CRM_Core_Session::singleton()->getLoggedInContactDisplayName()]
       );
@@ -414,4 +414,14 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
     ]);
   }
 
+  /**
+   * Set the defaults for the form.
+   *
+   * @return array
+   *   Array of default values
+   */
+  public function setDefaultValues() {
+    return $this->_defaults;
+  }
+
 }