projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 0f68d5a057c24f8f5fc97f1ca5a84558509596ef..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
}
// 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']);
}
$this->assign('rel_tables', $rowsElementsAndInfo['rel_tables']);
@@
-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;
+ }
+
}
}