From a352361988ca8f67a4cf5564d0cac3f894e8d1e3 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 18 May 2023 17:45:32 -0700 Subject: [PATCH] (REF) civicrm_data - Remove unused variables. Move the 1 that is used. --- sql/test_data_second_domain.mysql | 1 + xml/templates/civicrm_data.tpl | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql index 614b6fa425..dc3b3d9b8d 100644 --- a/sql/test_data_second_domain.mysql +++ b/sql/test_data_second_domain.mysql @@ -32,6 +32,7 @@ SELECT @locBlockId := id from civicrm_loc_block where phone_id = @phoneId AND em SELECT @option_group_id_mail_approval_status := max(id) from civicrm_option_group where name = 'mail_approval_status'; SELECT @option_group_id_fma := max(id) from civicrm_option_group where name = 'from_email_address'; + SELECT @mailCompId := max(id) FROM civicrm_component where name = 'CiviMail'; INSERT INTO `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `domain_id`, `visibility_id`) diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index a3f7482226..0a65920604 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -132,14 +132,6 @@ SELECT @option_group_id_pi := max(id) from civicrm_option_group wher SELECT @option_group_id_arel := max(id) from civicrm_option_group where name = 'account_relationship'; SELECT @option_group_id_fat := max(id) from civicrm_option_group where name = 'financial_account_type'; -SELECT @contributeCompId := max(id) FROM civicrm_component where name = 'CiviContribute'; -SELECT @eventCompId := max(id) FROM civicrm_component where name = 'CiviEvent'; -SELECT @memberCompId := max(id) FROM civicrm_component where name = 'CiviMember'; -SELECT @pledgeCompId := max(id) FROM civicrm_component where name = 'CiviPledge'; -SELECT @caseCompId := max(id) FROM civicrm_component where name = 'CiviCase'; -SELECT @campaignCompId := max(id) FROM civicrm_component where name = 'CiviCampaign'; -SELECT @mailCompId := max(id) FROM civicrm_component where name = 'CiviMail'; - -- financial accounts SELECT @opval := value FROM civicrm_option_value WHERE name = 'Revenue' and option_group_id = @option_group_id_fat; SELECT @opexp := value FROM civicrm_option_value WHERE name = 'Expenses' and option_group_id = @option_group_id_fat; -- 2.25.1