From 46be4fd7e6cbdb596ba6a9a080601f2a9539644a Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 16 Mar 2022 17:21:18 -0700 Subject: [PATCH 1/3] Set version to 5.47.2 --- ext/afform/admin/info.xml | 2 +- ext/afform/core/info.xml | 2 +- ext/afform/html/info.xml | 2 +- ext/afform/mock/info.xml | 2 +- ext/authx/info.xml | 2 +- ext/civigrant/info.xml | 2 +- ext/ckeditor4/info.xml | 2 +- ext/contributioncancelactions/info.xml | 2 +- ext/eventcart/info.xml | 2 +- ext/ewaysingle/info.xml | 2 +- ext/financialacls/info.xml | 2 +- ext/flexmailer/info.xml | 2 +- ext/greenwich/info.xml | 2 +- ext/legacycustomsearches/info.xml | 2 +- ext/message_admin/info.xml | 2 +- ext/oauth-client/info.xml | 2 +- ext/payflowpro/info.xml | 2 +- ext/recaptcha/info.xml | 2 +- ext/search_kit/info.xml | 2 +- ext/sequentialcreditnotes/info.xml | 2 +- sql/civicrm_generated.mysql | 2 +- sql/test_data_second_domain.mysql | 2 +- xml/version.xml | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml index 1467df44af34..d99b236aa48e 100644 --- a/ext/afform/admin/info.xml +++ b/ext/afform/admin/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.47.1 + 5.47.2 beta 5.23 diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml index b5dab78187b2..8e7a59c47db4 100644 --- a/ext/afform/core/info.xml +++ b/ext/afform/core/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.47.1 + 5.47.2 beta 5.23 diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml index 051dc0363ec2..73ca571d93b9 100644 --- a/ext/afform/html/info.xml +++ b/ext/afform/html/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.47.1 + 5.47.2 alpha 5.23 diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml index 198703ce3e7b..13cb0376f6a4 100644 --- a/ext/afform/mock/info.xml +++ b/ext/afform/mock/info.xml @@ -12,7 +12,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.47.1 + 5.47.2 mgmt:hidden diff --git a/ext/authx/info.xml b/ext/authx/info.xml index be1f324aef76..7fc3a33bb34c 100644 --- a/ext/authx/info.xml +++ b/ext/authx/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-02-11 - 5.47.1 + 5.47.2 alpha 5.0 diff --git a/ext/civigrant/info.xml b/ext/civigrant/info.xml index c4ad631c2c6c..3a969178fd4d 100644 --- a/ext/civigrant/info.xml +++ b/ext/civigrant/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-11-11 - 5.47.1 + 5.47.2 stable 5.47 diff --git a/ext/ckeditor4/info.xml b/ext/ckeditor4/info.xml index b1d88b4f2748..8fea031e2a61 100644 --- a/ext/ckeditor4/info.xml +++ b/ext/ckeditor4/info.xml @@ -15,7 +15,7 @@ https://www.gnu.org/licenses/agpl-3.0.html 2021-05-23 - 5.47.1 + 5.47.2 stable 5.39 diff --git a/ext/contributioncancelactions/info.xml b/ext/contributioncancelactions/info.xml index ec7876fd4a07..b8fc2b11fe78 100644 --- a/ext/contributioncancelactions/info.xml +++ b/ext/contributioncancelactions/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-12 - 5.47.1 + 5.47.2 stable 5.32 diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml index 3c3cee00ab05..775900ce0ec9 100644 --- a/ext/eventcart/info.xml +++ b/ext/eventcart/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-03 - 5.47.1 + 5.47.2 mgmt:hidden diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml index 50b8619fab3f..b89db4e82c07 100644 --- a/ext/ewaysingle/info.xml +++ b/ext/ewaysingle/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-07 - 5.47.1 + 5.47.2 mgmt:hidden diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml index 7926910996bd..80ee22643956 100644 --- a/ext/financialacls/info.xml +++ b/ext/financialacls/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-27 - 5.47.1 + 5.47.2 stable 5.30 diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml index 032b80571004..5472e5401546 100644 --- a/ext/flexmailer/info.xml +++ b/ext/flexmailer/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-05 - 5.47.1 + 5.47.2 stable FlexMailer is an email delivery engine which replaces the internal guts diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml index cb84a28f7dcf..d1a66e119f40 100644 --- a/ext/greenwich/info.xml +++ b/ext/greenwich/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-07-21 - 5.47.1 + 5.47.2 mgmt:hidden diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml index 4df94311d710..f4d7b0731e3b 100644 --- a/ext/legacycustomsearches/info.xml +++ b/ext/legacycustomsearches/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-07-25 - 5.47.1 + 5.47.2 stable mgmt:hidden diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml index 7bc571b1b5d7..7c3050a84d3b 100644 --- a/ext/message_admin/info.xml +++ b/ext/message_admin/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-06-12 - 5.47.1 + 5.47.2 mgmt:hidden diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml index 199198b3e67a..1915f7d5942f 100644 --- a/ext/oauth-client/info.xml +++ b/ext/oauth-client/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-23 - 5.47.1 + 5.47.2 stable 5.38 diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml index 312cc587afa3..3568f61e2463 100644 --- a/ext/payflowpro/info.xml +++ b/ext/payflowpro/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-04-13 - 5.47.1 + 5.47.2 stable 5.0 diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml index 5aeb92461d91..a9844f874831 100644 --- a/ext/recaptcha/info.xml +++ b/ext/recaptcha/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-04-03 - 5.47.1 + 5.47.2 mgmt:hidden diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml index 5af59f071838..e5944a768d5b 100644 --- a/ext/search_kit/info.xml +++ b/ext/search_kit/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-01-06 - 5.47.1 + 5.47.2 beta 5.38 diff --git a/ext/sequentialcreditnotes/info.xml b/ext/sequentialcreditnotes/info.xml index 4ddacd20e9b5..ef0e2cb33faa 100644 --- a/ext/sequentialcreditnotes/info.xml +++ b/ext/sequentialcreditnotes/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-28 - 5.47.1 + 5.47.2 mgmt:hidden diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index d4d44a8772c6..a61f1b2dc231 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -2941,7 +2941,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES - (1,'Default Domain Name',NULL,'5.47.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.47.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql index f0a358d5c58c..58aff9c3b452 100644 --- a/sql/test_data_second_domain.mysql +++ b/sql/test_data_second_domain.mysql @@ -909,4 +909,4 @@ INSERT INTO civicrm_navigation VALUES ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'), 'Mailing Detail Report', 'Mailing Detail Report', 'administer CiviMail', 'OR', @reportlastID, '1', NULL, @instanceID+2 ); UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID; -UPDATE civicrm_domain SET version = '5.47.1'; +UPDATE civicrm_domain SET version = '5.47.2'; diff --git a/xml/version.xml b/xml/version.xml index 49bd0e56c849..afe958081854 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.47.1 + 5.47.2 From 46289cf70bdc86715dce9b4257dd399783a86ccc Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 16 Mar 2022 17:53:46 -0700 Subject: [PATCH 2/3] (dev/core#2122) CiviEvent - Pre-upgrade warning --- CRM/Upgrade/Incremental/php/FiveFortySeven.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CRM/Upgrade/Incremental/php/FiveFortySeven.php b/CRM/Upgrade/Incremental/php/FiveFortySeven.php index dc6a8bd0d456..017179be4630 100644 --- a/CRM/Upgrade/Incremental/php/FiveFortySeven.php +++ b/CRM/Upgrade/Incremental/php/FiveFortySeven.php @@ -33,6 +33,14 @@ class CRM_Upgrade_Incremental_php_FiveFortySeven extends CRM_Upgrade_Incremental * @param null $currentVer */ public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL): void { + if ($rev === '5.47.alpha1' && version_compare($currentVer, '5.47', '<')) { + // Note: This warning should only exist within a few patch releases of 5.47. Do not merge-forward. + $prose = ts('CiviEvent users may have migration problems with v%1. CiviEvent users should consider v5.46 instead. More information', [ + 1 => CRM_Utils_System::version(), + 2 => 'target="_blank" href="https://civicrm.org/redirect/event-timezone-5.47"', + ]); + $preUpgradeMessage = '

' . $prose . '

' . $preUpgradeMessage; + } if ($rev === '5.47.alpha1') { $count = CRM_Core_DAO::singleValueQuery('SELECT count(*) FROM civicrm_contact WHERE preferred_mail_format != "Both"'); if ($count) { From fd684a60028933bf4e71c27c1b09862548f4cd95 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 16 Mar 2022 18:57:07 -0700 Subject: [PATCH 3/3] (NFC) FiveFortySeven - Make text more consistent Match other hpyerlinks --- CRM/Upgrade/Incremental/php/FiveFortySeven.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Upgrade/Incremental/php/FiveFortySeven.php b/CRM/Upgrade/Incremental/php/FiveFortySeven.php index 017179be4630..39cca20e33c4 100644 --- a/CRM/Upgrade/Incremental/php/FiveFortySeven.php +++ b/CRM/Upgrade/Incremental/php/FiveFortySeven.php @@ -35,7 +35,7 @@ class CRM_Upgrade_Incremental_php_FiveFortySeven extends CRM_Upgrade_Incremental public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL): void { if ($rev === '5.47.alpha1' && version_compare($currentVer, '5.47', '<')) { // Note: This warning should only exist within a few patch releases of 5.47. Do not merge-forward. - $prose = ts('CiviEvent users may have migration problems with v%1. CiviEvent users should consider v5.46 instead. More information', [ + $prose = ts('CiviEvent users may have migration problems with v%1. CiviEvent users should consider v5.46 instead. (Learn more...)', [ 1 => CRM_Utils_System::version(), 2 => 'target="_blank" href="https://civicrm.org/redirect/event-timezone-5.47"', ]);