From 54312ea9075acf3458618f3340d804f54a82f06e Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Wed, 18 Mar 2020 11:53:10 -0400 Subject: [PATCH] dev/core#1280 Fix ContributionPage soft_credit translation --- CRM/Contribute/BAO/ContributionPage.php | 4 ++-- CRM/Contribute/Form/ContributionPage/Settings.php | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CRM/Contribute/BAO/ContributionPage.php b/CRM/Contribute/BAO/ContributionPage.php index d050ef3d7e..6c33178b36 100644 --- a/CRM/Contribute/BAO/ContributionPage.php +++ b/CRM/Contribute/BAO/ContributionPage.php @@ -914,9 +914,9 @@ LEFT JOIN civicrm_premiums ON ( civicrm_premiums.entity_id = civicrm $json = [$module => NULL]; foreach ($moduleDataFormat[$module] as $key => $attribute) { if ($key === 'multilingual') { - $json[$module][$config->lcMessages] = []; + $json[$module][$tsLocale] = []; foreach ($attribute as $attr) { - $json[$module][$config->lcMessages][$attr] = $params[$attr]; + $json[$module][$tsLocale][$attr] = $params[$attr]; } } else { diff --git a/CRM/Contribute/Form/ContributionPage/Settings.php b/CRM/Contribute/Form/ContributionPage/Settings.php index 06c9821a77..3ea426b48c 100644 --- a/CRM/Contribute/Form/ContributionPage/Settings.php +++ b/CRM/Contribute/Form/ContributionPage/Settings.php @@ -348,8 +348,16 @@ class CRM_Contribute_Form_ContributionPage_Settings extends CRM_Contribute_Form_ foreach ($ufJoinParams as $index => $ufJoinParam) { if (!empty($params[$index])) { - // first delete all past entries - CRM_Core_BAO_UFJoin::deleteAll($ufJoinParam); + // Look for an existing entry + $ufJoinDAO = new CRM_Core_DAO_UFJoin(); + $ufJoinDAO->module = $ufJoinParam['module']; + $ufJoinDAO->entity_id = $ufJoinParam['entity_id']; + $ufJoinDAO->find(TRUE); + + if (!empty($ufJoinDAO->id)) { + $ufJoinParam['id'] = $ufJoinDAO->id; + } + $ufJoinParam['uf_group_id'] = $params[$index]; $ufJoinParam['weight'] = 1; $ufJoinParam['is_active'] = 1; -- 2.25.1