From 0653585fe389aba4d8f23ef5803e9b44c0f99ae0 Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Tue, 19 Nov 2013 09:15:37 -0800 Subject: [PATCH] CRM-13780 - rework error message ---------------------------------------- * CRM-13780: Don't allow users to attempt to merge the Default Organization into another organization http://issues.civicrm.org/jira/browse/CRM-13780 --- CRM/Contact/Form/Merge.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php index 369587ea35..18662a2dc5 100644 --- a/CRM/Contact/Form/Merge.php +++ b/CRM/Contact/Form/Merge.php @@ -298,12 +298,12 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { static function formRule($fields, $files, $self) { $errors = array(); - $link = CRM_Utils_System::href(ts('Flip between the original and duplicate contacts'), + $link = CRM_Utils_System::href(ts('Flip between the original and duplicate contacts.'), 'civicrm/contact/merge', 'reset=1&action=update&cid=' . $self->_oid . '&oid=' . $self->_cid . '&rgid=' . $self->_rgid . '&flip=1' ); if (CRM_Contact_BAO_Contact::checkDomainContact($self->_oid)) { - $errors['_qf_default'] = ts("The Default Organization contact cannot be merged into another contact record. It is associated with the CiviCRM installation for this domain and contains information used for system functions. If you want to merge these records, you can click the link to %1 and then continue with the merge.", array(1 => $link)); + $errors['_qf_default'] = ts("The Default Organization contact cannot be merged into another contact record. It is associated with the CiviCRM installation for this domain and contains information used for system functions. If you want to merge these records, you can: %1", array(1 => $link)); } return $errors; } -- 2.25.1