From 285ba9b3a92ab2f74fc7955497c186d2ff34c3f4 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Wed, 26 Jul 2023 07:03:27 -0400
Subject: [PATCH] civicrm release-5.63.2
---
civicrm.php | 4 +-
civicrm/CRM/Price/BAO/PriceField.php | 5 ++-
civicrm/CRM/Upgrade/Incremental/General.php | 2 +-
civicrm/civicrm-version.php | 2 +-
civicrm/ext/afform/admin/info.xml | 2 +-
civicrm/ext/afform/core/info.xml | 2 +-
civicrm/ext/afform/html/info.xml | 2 +-
civicrm/ext/afform/mock/info.xml | 2 +-
civicrm/ext/authx/info.xml | 2 +-
civicrm/ext/civi_campaign/info.xml | 2 +-
civicrm/ext/civi_case/info.xml | 2 +-
civicrm/ext/civi_contribute/info.xml | 2 +-
civicrm/ext/civi_event/info.xml | 2 +-
civicrm/ext/civi_mail/info.xml | 2 +-
civicrm/ext/civi_member/info.xml | 2 +-
civicrm/ext/civi_pledge/info.xml | 2 +-
civicrm/ext/civi_report/info.xml | 2 +-
civicrm/ext/civicrm_admin_ui/info.xml | 2 +-
civicrm/ext/civigrant/info.xml | 2 +-
civicrm/ext/civiimport/info.xml | 2 +-
civicrm/ext/ckeditor4/info.xml | 2 +-
.../ext/contributioncancelactions/info.xml | 2 +-
civicrm/ext/elavon/info.xml | 2 +-
civicrm/ext/eventcart/info.xml | 2 +-
civicrm/ext/ewaysingle/info.xml | 2 +-
civicrm/ext/financialacls/info.xml | 2 +-
civicrm/ext/flexmailer/info.xml | 2 +-
civicrm/ext/greenwich/info.xml | 2 +-
civicrm/ext/legacycustomsearches/info.xml | 2 +-
civicrm/ext/message_admin/info.xml | 2 +-
civicrm/ext/oauth-client/info.xml | 2 +-
civicrm/ext/payflowpro/info.xml | 2 +-
civicrm/ext/recaptcha/info.xml | 2 +-
civicrm/ext/search_kit/info.xml | 2 +-
civicrm/ext/sequentialcreditnotes/info.xml | 2 +-
civicrm/release-notes.md | 9 +++++
civicrm/release-notes/5.63.2.md | 40 +++++++++++++++++++
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
.../CRM/Custom/Form/Edit/CustomField.tpl | 10 ++---
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 14 +++----
civicrm/vendor/composer/autoload_static.php | 12 +++---
civicrm/vendor/composer/installed.php | 4 +-
civicrm/xml/version.xml | 2 +-
45 files changed, 110 insertions(+), 62 deletions(-)
create mode 100644 civicrm/release-notes/5.63.2.md
diff --git a/civicrm.php b/civicrm.php
index cbe71c9457..5ce81b2fc7 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.63.1
+ * Version: 5.63.2
* Requires at least: 4.9
* Requires PHP: 7.3
* Author: CiviCRM LLC
@@ -36,7 +36,7 @@ if (!defined('ABSPATH')) {
}
// Set version here: changing it forces Javascript and CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '5.63.1');
+define('CIVICRM_PLUGIN_VERSION', '5.63.2');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Price/BAO/PriceField.php b/civicrm/CRM/Price/BAO/PriceField.php
index 511fbb0dcb..06730389c5 100644
--- a/civicrm/CRM/Price/BAO/PriceField.php
+++ b/civicrm/CRM/Price/BAO/PriceField.php
@@ -445,11 +445,12 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
break;
case 'Select':
- $selectOption = $allowedOptions = [];
+ $selectOption = $allowedOptions = $priceVal = [];
foreach ($customOption as $opt) {
$priceOptionText = self::buildPriceOptionText($opt, $field->is_display_amounts, $valueFieldName);
$priceOptionText['label'] = strip_tags($priceOptionText['label']);
+ $priceVal[$opt['id']] = $priceOptionText['priceVal'];
if (!in_array($opt['id'], $freezeOptions)) {
$allowedOptions[] = $opt['id'];
@@ -484,7 +485,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
$element = &$qf->add('select', $elementName, $label, $selectOption, $useRequired && $field->is_required, [
'placeholder' => ts('- select %1 -', [1 => $label]),
- 'price' => json_encode($priceOptionText['priceVal']),
+ 'price' => json_encode($priceVal),
'class' => 'crm-select2' . $class,
'data-price-field-values' => json_encode($customOption),
]);
diff --git a/civicrm/CRM/Upgrade/Incremental/General.php b/civicrm/CRM/Upgrade/Incremental/General.php
index ddb6874384..38f9cd01e6 100644
--- a/civicrm/CRM/Upgrade/Incremental/General.php
+++ b/civicrm/CRM/Upgrade/Incremental/General.php
@@ -33,7 +33,7 @@ class CRM_Upgrade_Incremental_General {
*
* A site running an earlier version will be told to upgrade.
*/
- const MIN_RECOMMENDED_PHP_VER = '7.3.0';
+ const MIN_RECOMMENDED_PHP_VER = '7.4.0';
/**
* The minimum PHP version required to install Civi.
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index ce24d1ae83..13b933a413 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.63.1',
+ return array( 'version' => '5.63.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index ec50f0cfb9..571188e97f 100644
--- a/civicrm/ext/afform/admin/info.xml
+++ b/civicrm/ext/afform/admin/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 7ff71d56bf..5fe92ec4a5 100644
--- a/civicrm/ext/afform/core/info.xml
+++ b/civicrm/ext/afform/core/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index c1e613667f..3dd31db5b5 100644
--- a/civicrm/ext/afform/html/info.xml
+++ b/civicrm/ext/afform/html/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index 5aff9b7eeb..6c71c1516e 100644
--- a/civicrm/ext/afform/mock/info.xml
+++ b/civicrm/ext/afform/mock/info.xml
@@ -12,7 +12,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index ae1d8c8c2d..afc9d7139c 100644
--- a/civicrm/ext/authx/info.xml
+++ b/civicrm/ext/authx/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-02-11</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/civi_campaign/info.xml b/civicrm/ext/civi_campaign/info.xml
index bc4f3bbd38..b62977c1c7 100644
--- a/civicrm/ext/civi_campaign/info.xml
+++ b/civicrm/ext/civi_campaign/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-04-08</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_case/info.xml b/civicrm/ext/civi_case/info.xml
index 946b417bb7..fe7ce69f42 100644
--- a/civicrm/ext/civi_case/info.xml
+++ b/civicrm/ext/civi_case/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-04-08</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_contribute/info.xml b/civicrm/ext/civi_contribute/info.xml
index c435ca1e00..9315549d5d 100644
--- a/civicrm/ext/civi_contribute/info.xml
+++ b/civicrm/ext/civi_contribute/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-04-08</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_event/info.xml b/civicrm/ext/civi_event/info.xml
index 8a02b44f93..a76d8c375a 100644
--- a/civicrm/ext/civi_event/info.xml
+++ b/civicrm/ext/civi_event/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-04-08</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_mail/info.xml b/civicrm/ext/civi_mail/info.xml
index f5e0f2931f..1f69a6bbf4 100644
--- a/civicrm/ext/civi_mail/info.xml
+++ b/civicrm/ext/civi_mail/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-04-08</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_member/info.xml b/civicrm/ext/civi_member/info.xml
index 7e7e7cca3e..5feacc2b28 100644
--- a/civicrm/ext/civi_member/info.xml
+++ b/civicrm/ext/civi_member/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-04-08</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_pledge/info.xml b/civicrm/ext/civi_pledge/info.xml
index adf85af640..6e5b7dde6f 100644
--- a/civicrm/ext/civi_pledge/info.xml
+++ b/civicrm/ext/civi_pledge/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-04-08</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_report/info.xml b/civicrm/ext/civi_report/info.xml
index cf9630df27..2ae5faca4a 100644
--- a/civicrm/ext/civi_report/info.xml
+++ b/civicrm/ext/civi_report/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-04-08</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index 475e11fc55..9b7fabb709 100644
--- a/civicrm/ext/civicrm_admin_ui/info.xml
+++ b/civicrm/ext/civicrm_admin_ui/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-01-02</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index d14d0ab506..0d61b2fbfb 100644
--- a/civicrm/ext/civigrant/info.xml
+++ b/civicrm/ext/civigrant/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-11-11</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index e5d4d55259..62d5020880 100644
--- a/civicrm/ext/civiimport/info.xml
+++ b/civicrm/ext/civiimport/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-08-11</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 45bde47390..36384e6674 100644
--- a/civicrm/ext/ckeditor4/info.xml
+++ b/civicrm/ext/ckeditor4/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-05-23</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 20065bd149..8f1820181a 100644
--- a/civicrm/ext/contributioncancelactions/info.xml
+++ b/civicrm/ext/contributioncancelactions/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-12</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index cc77285bd1..97d8155da9 100644
--- a/civicrm/ext/elavon/info.xml
+++ b/civicrm/ext/elavon/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-08-05</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index ec1ada4690..12f50cd004 100644
--- a/civicrm/ext/eventcart/info.xml
+++ b/civicrm/ext/eventcart/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-03</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index a0e4d7de48..21f19ac43f 100644
--- a/civicrm/ext/ewaysingle/info.xml
+++ b/civicrm/ext/ewaysingle/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-07</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 6604c18916..30d77b0a14 100644
--- a/civicrm/ext/financialacls/info.xml
+++ b/civicrm/ext/financialacls/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-27</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index e2c83abe5c..fd56ef5fc0 100644
--- a/civicrm/ext/flexmailer/info.xml
+++ b/civicrm/ext/flexmailer/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-05</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<comments>
FlexMailer is an email delivery engine which replaces the internal guts
diff --git a/civicrm/ext/greenwich/info.xml b/civicrm/ext/greenwich/info.xml
index e054fadef0..706c3d95e2 100644
--- a/civicrm/ext/greenwich/info.xml
+++ b/civicrm/ext/greenwich/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-07-21</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index ddfc1d8028..88eecd744d 100644
--- a/civicrm/ext/legacycustomsearches/info.xml
+++ b/civicrm/ext/legacycustomsearches/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-07-25</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:hidden</tag>
diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml
index 1af05b9140..ea4159d579 100644
--- a/civicrm/ext/message_admin/info.xml
+++ b/civicrm/ext/message_admin/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-06-12</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index b36d0832dc..4af5bbe48e 100644
--- a/civicrm/ext/oauth-client/info.xml
+++ b/civicrm/ext/oauth-client/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-23</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 38bd2edd50..8d4f170cc1 100644
--- a/civicrm/ext/payflowpro/info.xml
+++ b/civicrm/ext/payflowpro/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-04-13</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.63</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index e25398f9a3..d0116df2d7 100644
--- a/civicrm/ext/recaptcha/info.xml
+++ b/civicrm/ext/recaptcha/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-04-03</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 2a0d6c1abd..9b557d9954 100644
--- a/civicrm/ext/search_kit/info.xml
+++ b/civicrm/ext/search_kit/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-01-06</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index c955fe06bc..372c91a492 100644
--- a/civicrm/ext/sequentialcreditnotes/info.xml
+++ b/civicrm/ext/sequentialcreditnotes/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-28</releaseDate>
- <version>5.63.1</version>
+ <version>5.63.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index e3be859228..d59b53ae4c 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -15,6 +15,15 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 5.63.2
+
+Released July 26, 2023
+
+- **[Synopsis](release-notes/5.63.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.63.2.md#bugs)**
+- **[Credits](release-notes/5.63.2.md#credits)**
+- **[Feedback](release-notes/5.63.2.md#feedback)**
+
## CiviCRM 5.63.1
Released July 7, 2023
diff --git a/civicrm/release-notes/5.63.2.md b/civicrm/release-notes/5.63.2.md
new file mode 100644
index 0000000000..9351a718fa
--- /dev/null
+++ b/civicrm/release-notes/5.63.2.md
@@ -0,0 +1,40 @@
+# CiviCRM 5.63.2
+
+Released July 26, 2023
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+| --------------------------------------------------------------- | -------- |
+| Change the database schema? | no |
+| Alter the API? | no |
+| Require attention to configuration options? | no |
+| Fix problems installing or upgrading to a previous version? | no |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+| Fix security vulnerabilities? | no |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_Custom Data_: Fatal error handling radio buttons in varied circumstances ([dev/core#4355](https://lab.civicrm.org/dev/core/-/issues/4355): [#26517](https://github.com/civicrm/civicrm-core/pull/26517))**
+* **_Price Sets_: Browser error handling select field ([dev/core#4439](https://lab.civicrm.org/dev/core/-/issues/4439): [#26870](https://github.com/civicrm/civicrm-core/pull/26870))**
+* **_System Recommendations_: PHP 7.4 is recommended ([#26799](https://github.com/civicrm/civicrm-core/pull/26799))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wildsight - Lars Sander-Green; Wikimedia Foundation - Eileen McNaughton; Megaphone
+Technology Consulting - Jon Goldberg; JMA Consulting - Seamus Lee; Dave D; Coop SymbioTIC
+- Mathieu Lutfy; CiviDesk - Yashodha Chaku; CiviCRM - Coleman Watts, Tim Otten
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt. If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index 437b6934e9..7ad4e1599c 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -24025,4 +24025,4 @@ INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
VALUES
( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
-UPDATE civicrm_domain SET version = '5.63.1';
+UPDATE civicrm_domain SET version = '5.63.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 4475f05a63..4ee7e20a15 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -3042,7 +3042,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.63.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.63.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl b/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
index 7a4089fb03..5a90fb207a 100644
--- a/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
@@ -19,19 +19,17 @@
<td class="label">{$formElement.label}{if $element.help_post}{help id=$element.id file="CRM/Custom/Form/CustomField.hlp" title=$element.label}{/if}</td>
<td class="html-adjust">
{assign var="count" value="1"}
- {* sort by fails for option per line. Added a variable to iterate through the element array*}
- {assign var="index" value="1"}
{foreach name=outer key=key item=item from=$formElement}
- {if $index < 10}
- {assign var="index" value=`$index+1`}
- {else}
- {$formElement.$key.html}
+ {if is_array($item) && array_key_exists('html', $item)}
+ {$item.html}
{if $count == $element.options_per_line}
<br />
{assign var="count" value="1"}
{else}
{assign var="count" value=`$count+1`}
{/if}
+ {else}
+ {* Skip because this isn't one of the numeric keyed elements that are the options to display, it's non-numeric keys like the field label and metadata. *}
{/if}
{/foreach}
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index fb9016d069..f59d37b2fa 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14::getLoader();
+return ComposerAutoloaderInit7f1ba51e57274bc8afccdd852fc46a9b::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 3c3b61ed58..e2ed5939ea 100644
--- a/civicrm/vendor/composer/autoload_real.php
+++ b/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14
+class ComposerAutoloaderInit7f1ba51e57274bc8afccdd852fc46a9b
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit7f1ba51e57274bc8afccdd852fc46a9b', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit7f1ba51e57274bc8afccdd852fc46a9b', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit7f1ba51e57274bc8afccdd852fc46a9b::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit7f1ba51e57274bc8afccdd852fc46a9b::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequirefd642c2119abd8f57d9c6c5ebd3c4b14($fileIdentifier, $file);
+ composerRequire7f1ba51e57274bc8afccdd852fc46a9b($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14
* @param string $file
* @return void
*/
-function composerRequirefd642c2119abd8f57d9c6c5ebd3c4b14($fileIdentifier, $file)
+function composerRequire7f1ba51e57274bc8afccdd852fc46a9b($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 304d45f41d..acd1ea20b3 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14
+class ComposerStaticInit7f1ba51e57274bc8afccdd852fc46a9b
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -729,11 +729,11 @@ class ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit7f1ba51e57274bc8afccdd852fc46a9b::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit7f1ba51e57274bc8afccdd852fc46a9b::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit7f1ba51e57274bc8afccdd852fc46a9b::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit7f1ba51e57274bc8afccdd852fc46a9b::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit7f1ba51e57274bc8afccdd852fc46a9b::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index a7239e86ed..a581171d6c 100644
--- a/civicrm/vendor/composer/installed.php
+++ b/civicrm/vendor/composer/installed.php
@@ -5,7 +5,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '27dd9bcab5d0ece3f73e0c6d2a1c7d3966d03c58',
+ 'reference' => '609756834e7520dc43374aa1d30c47d09d080058',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -43,7 +43,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '27dd9bcab5d0ece3f73e0c6d2a1c7d3966d03c58',
+ 'reference' => '609756834e7520dc43374aa1d30c47d09d080058',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 5ca8b6b27d..ec0be5a990 100644
--- a/civicrm/xml/version.xml
+++ b/civicrm/xml/version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<version>
- <version_no>5.63.1</version_no>
+ <version_no>5.63.2</version_no>
</version>
--
GitLab