From 2b0c6f6dc7ca7a304094b128de2cc5c48af7ab99 Mon Sep 17 00:00:00 2001 From: CiviCRM Date: Fri, 7 Jul 2017 23:19:33 +0000 Subject: [PATCH] Rename v4.7.22 to v4.7.23 There seems to be a consensus for issuing a quick patch to `4.7.21` as `4.7.22`. This means that `master` needs to be renumbered as `4.7.23`. --- .../civicrm_msg_template.tpl | 0 .../contribution_invoice_receipt_html.tpl | 0 CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl | 16 +--------------- CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl | 15 +++++++++++++++ sql/civicrm_generated.mysql | 2 +- xml/version.xml | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) rename CRM/Upgrade/{4.7.22.msg_template => 4.7.23.msg_template}/civicrm_msg_template.tpl (100%) rename CRM/Upgrade/{4.7.22.msg_template => 4.7.23.msg_template}/message_templates/contribution_invoice_receipt_html.tpl (100%) create mode 100644 CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl diff --git a/CRM/Upgrade/4.7.22.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl similarity index 100% rename from CRM/Upgrade/4.7.22.msg_template/civicrm_msg_template.tpl rename to CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl diff --git a/CRM/Upgrade/4.7.22.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.7.23.msg_template/message_templates/contribution_invoice_receipt_html.tpl similarity index 100% rename from CRM/Upgrade/4.7.22.msg_template/message_templates/contribution_invoice_receipt_html.tpl rename to CRM/Upgrade/4.7.23.msg_template/message_templates/contribution_invoice_receipt_html.tpl diff --git a/CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl index a06e4844e5..d475831b71 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl @@ -1,15 +1 @@ -{* file to handle db changes in 4.7.22 during upgrade *} - -{include file='../CRM/Upgrade/4.7.22.msg_template/civicrm_msg_template.tpl'} - --- CRM-20816: Add CiviCase settings - -SELECT @civicaseAdminId := id FROM civicrm_navigation WHERE name = 'CiviCase' AND domain_id = {$domainID}; - -INSERT INTO civicrm_navigation -(domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight) -VALUES -({$domainID}, 'civicrm/admin/setting/case?reset=1', '{ts escape="sql" skip="true"}CiviCase Settings{/ts}', 'CiviCase Settings', NULL, 'AND', @civicaseAdminId, '1', NULL, 1); - --- CRM-20387 -UPDATE `civicrm_contribution` SET `invoice_number` = `invoice_id` WHERE `invoice_id` LIKE CONCAT('%', `id`); +{* v4.7.22 is an urgent release. It should have not have schema changes. *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl new file mode 100644 index 0000000000..d0b5dc4527 --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl @@ -0,0 +1,15 @@ +{* file to handle db changes in 4.7.23 during upgrade *} + +{include file='../CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl'} + +-- CRM-20816: Add CiviCase settings + +SELECT @civicaseAdminId := id FROM civicrm_navigation WHERE name = 'CiviCase' AND domain_id = {$domainID}; + +INSERT INTO civicrm_navigation +(domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight) +VALUES +({$domainID}, 'civicrm/admin/setting/case?reset=1', '{ts escape="sql" skip="true"}CiviCase Settings{/ts}', 'CiviCase Settings', NULL, 'AND', @civicaseAdminId, '1', NULL, 1); + +-- CRM-20387 +UPDATE `civicrm_contribution` SET `invoice_number` = `invoice_id` WHERE `invoice_id` LIKE CONCAT('%', `id`); diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 3b7ecb11ff..98cd9216be 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -399,7 +399,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; -INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.22',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); +INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.23',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/xml/version.xml b/xml/version.xml index 4c5afec523..85d892b83f 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 4.7.22 + 4.7.23 -- 2.25.1