From 9ce7c8b4358171b5a75bc84640ebbe90790835ec Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Fri, 18 Aug 2023 07:15:53 -0400
Subject: [PATCH] civicrm release-5.64.1
---
civicrm.php | 4 +-
civicrm/CRM/ACL/DAO/ACL.php | 10 +----
.../Form/ContributionPage/Amount.php | 23 ++++++----
civicrm/CRM/Contribute/Tokens.php | 3 ++
civicrm/CRM/Core/EntityTokens.php | 4 +-
civicrm/CRM/Event/Form/Participant.php | 6 +--
civicrm/CRM/Member/Form/MembershipBlock.php | 22 ++++++----
civicrm/CRM/Member/Tokens.php | 3 ++
.../Upgrade/Incremental/php/FiveSixtyFour.php | 5 +++
.../Upgrade/Incremental/php/FiveSixtyTwo.php | 24 +++++++---
civicrm/Civi/Api4/EntitySet.php | 4 +-
civicrm/Civi/Api4/Utils/FormattingUtil.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/ext/standaloneusers/info.xml | 2 +-
civicrm/release-notes.md | 9 ++++
civicrm/release-notes/5.64.1.md | 44 +++++++++++++++++++
civicrm/sql/civicrm.mysql | 3 +-
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
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/schema/ACL/ACL.xml | 4 --
civicrm/xml/version.xml | 2 +-
56 files changed, 174 insertions(+), 100 deletions(-)
create mode 100644 civicrm/release-notes/5.64.1.md
diff --git a/civicrm.php b/civicrm.php
index 7f7ab897da..89d71f97b5 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.64.0
+ * Version: 5.64.1
* 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.64.0');
+define('CIVICRM_PLUGIN_VERSION', '5.64.1');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/ACL/DAO/ACL.php b/civicrm/CRM/ACL/DAO/ACL.php
index c370ec642b..d555c818bc 100644
--- a/civicrm/CRM/ACL/DAO/ACL.php
+++ b/civicrm/CRM/ACL/DAO/ACL.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/ACL/ACL.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a77f71abc7be09b3df836ddb6e5d2990)
+ * (GenCodeChecksum:a67412fdfd84b0708c99261353a987fd)
*/
/**
@@ -541,14 +541,6 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
'localizable' => FALSE,
'sig' => 'civicrm_acl::0::acl_id',
],
- 'index_priority' => [
- 'name' => 'index_priority',
- 'field' => [
- 0 => 'priority',
- ],
- 'localizable' => FALSE,
- 'sig' => 'civicrm_acl::0::priority',
- ],
];
return ($localize && !empty($indices)) ? CRM_Core_DAO_AllCoreTables::multilingualize(__CLASS__, $indices) : $indices;
}
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php b/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
index b0d246f374..ec1a4300d3 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
@@ -311,14 +311,19 @@ class CRM_Contribute_Form_ContributionPage_Amount extends CRM_Contribute_Form_Co
$membershipBlock->is_active = 1;
$hasMembershipBlk = FALSE;
if ($membershipBlock->find(TRUE)) {
- if (!empty($fields['amount_block_is_active']) &&
- ($setID = CRM_Price_BAO_PriceSet::getFor('civicrm_contribution_page', $self->_id, NULL, 1))
- ) {
- $extends = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $setID, 'extends');
- if ($extends && $extends == CRM_Core_Component::getComponentID('CiviMember')) {
- $errors['amount_block_is_active'] = ts('You cannot use a Membership Price Set when the Contribution Amounts section is enabled. Click the Memberships tab above, and select your Membership Price Set on that form. Membership Price Sets may include additional fields for non-membership options that require an additional fee (e.g. magazine subscription) or an additional voluntary contribution.');
- return $errors;
- }
+ // Don't allow Contribution price set w/ membership signup, CRM-5095.
+ $priceSetExtendsMembership = \Civi\Api4\PriceSetEntity::get(FALSE)
+ ->addSelect('id')
+ ->addJoin('PriceSet AS price_set', 'LEFT', ['price_set_id', '=', 'price_set.id'])
+ ->addWhere('entity_table', '=', 'civicrm_contribution_page')
+ ->addWhere('entity_id', '=', $self->_id)
+ ->addWhere('price_set.extends:name', 'CONTAINS', 'CiviMember')
+ ->addWhere('price_set.is_quick_config', '=', 0)
+ ->execute()
+ ->first();
+ if (!empty($fields['amount_block_is_active']) && $priceSetExtendsMembership) {
+ $errors['amount_block_is_active'] = ts('You cannot use a Membership Price Set when the Contribution Amounts section is enabled. Click the Memberships tab above, and select your Membership Price Set on that form. Membership Price Sets may include additional fields for non-membership options that require an additional fee (e.g. magazine subscription) or an additional voluntary contribution.');
+ return $errors;
}
$hasMembershipBlk = TRUE;
if ($membershipBlock->is_separate_payment && empty($fields['amount_block_is_active'])) {
@@ -376,7 +381,7 @@ class CRM_Contribute_Form_ContributionPage_Amount extends CRM_Contribute_Form_Co
if ($priceSetId = CRM_Utils_Array::value('price_set_id', $fields)) {
// don't allow price set w/ membership.
if ($hasMembershipBlk) {
- $errors['price_set_id'] = ts('You cannot enable both a Contribution Price Set and Membership Signup on the same online contribution page.');
+ $errors['price_set_id'] = ts('You cannot enable both Membership Signup and a Contribution Price Set on the same online contribution page.');
}
}
else {
diff --git a/civicrm/CRM/Contribute/Tokens.php b/civicrm/CRM/Contribute/Tokens.php
index 7436b0b239..39f87b1231 100644
--- a/civicrm/CRM/Contribute/Tokens.php
+++ b/civicrm/CRM/Contribute/Tokens.php
@@ -55,6 +55,9 @@ class CRM_Contribute_Tokens extends CRM_Core_EntityTokens {
*/
protected function getRelatedTokens(): array {
$tokens = [];
+ if (!in_array('ContributionRecur', array_keys(\Civi::service('action_object_provider')->getEntities()))) {
+ return $tokens;
+ }
$hiddenTokens = ['modified_date', 'create_date', 'trxn_id', 'invoice_id', 'is_test', 'payment_token_id', 'payment_processor_id', 'payment_instrument_id', 'cycle_day', 'installments', 'processor_id', 'next_sched_contribution_date', 'failure_count', 'failure_retry_date', 'auto_renew', 'is_email_receipt', 'contribution_status_id'];
$contributionRecurFields = ContributionRecur::getFields(FALSE)->setLoadOptions(TRUE)->execute();
foreach ($contributionRecurFields as $contributionRecurField) {
diff --git a/civicrm/CRM/Core/EntityTokens.php b/civicrm/CRM/Core/EntityTokens.php
index bf94a19d04..012d744619 100644
--- a/civicrm/CRM/Core/EntityTokens.php
+++ b/civicrm/CRM/Core/EntityTokens.php
@@ -348,10 +348,10 @@ class CRM_Core_EntityTokens extends AbstractTokenSubscriber {
* @return bool
*/
public function checkActive(TokenProcessor $processor) {
- return (!empty($processor->context['actionMapping'])
+ return ((!empty($processor->context['actionMapping'])
// This makes the 'schema context compulsory - which feels accidental
// since recent discu
- && $processor->context['actionMapping']->getEntity()) || in_array($this->getEntityIDField(), $processor->context['schema']);
+ && $processor->context['actionMapping']->getEntity()) || in_array($this->getEntityIDField(), $processor->context['schema'])) && in_array($this->getApiEntityName(), array_keys(\Civi::service('action_object_provider')->getEntities()));
}
/**
diff --git a/civicrm/CRM/Event/Form/Participant.php b/civicrm/CRM/Event/Form/Participant.php
index 20baaa48c7..bafb41e044 100644
--- a/civicrm/CRM/Event/Form/Participant.php
+++ b/civicrm/CRM/Event/Form/Participant.php
@@ -1349,7 +1349,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
}
if (!empty($params['send_receipt'])) {
- $result = $this->sendReceipts($params, $contributionParams['total_amount'], $customFields, $participants, $lineItem[0], $line, $value, $additionalParticipantDetails);
+ $result = $this->sendReceipts($params, $contributionParams['total_amount'], $customFields, $participants, $lineItem[0], $additionalParticipantDetails);
}
// set the participant id if it is not set
@@ -2105,14 +2105,12 @@ INNER JOIN civicrm_price_field_value value ON ( value.id = lineItem.price_field_
* @param array $customFields
* @param array $participants
* @param $lineItem
- * @param $line
- * @param $value
* @param $additionalParticipantDetails
*
* @return array
* @throws \CRM_Core_Exception
*/
- protected function sendReceipts($params, $total_amount, array $customFields, array $participants, $lineItem, $line, $value, $additionalParticipantDetails): array {
+ protected function sendReceipts($params, $total_amount, array $customFields, array $participants, $lineItem, $additionalParticipantDetails): array {
$sent = [];
$notSent = [];
$this->assign('module', 'Event Registration');
diff --git a/civicrm/CRM/Member/Form/MembershipBlock.php b/civicrm/CRM/Member/Form/MembershipBlock.php
index 179c437a6c..9018e63bc4 100644
--- a/civicrm/CRM/Member/Form/MembershipBlock.php
+++ b/civicrm/CRM/Member/Form/MembershipBlock.php
@@ -241,15 +241,19 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
}
}
if (!empty($params['member_is_active'])) {
-
- // don't allow price set w/ membership signup, CRM-5095
- if ($contributionPageId && ($setID = CRM_Price_BAO_PriceSet::getFor('civicrm_contribution_page', $contributionPageId, NULL, 1))) {
-
- $extends = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $setID, 'extends');
- if ($extends != CRM_Core_Component::getComponentID('CiviMember')) {
- $errors['member_is_active'] = ts('You cannot enable both Membership Signup and a Contribution Price Set on the same online contribution page.');
- return $errors;
- }
+ // Don't allow Contribution price set w/ membership signup, CRM-5095.
+ $priceSetExtendsMembership = \Civi\Api4\PriceSetEntity::get(FALSE)
+ ->addSelect('id')
+ ->addJoin('PriceSet AS price_set', 'LEFT', ['price_set_id', '=', 'price_set.id'])
+ ->addWhere('entity_table', '=', 'civicrm_contribution_page')
+ ->addWhere('entity_id', '=', $contributionPageId)
+ ->addWhere('price_set.extends:name', 'CONTAINS', 'CiviMember')
+ ->addWhere('price_set.is_quick_config', '=', 0)
+ ->execute()
+ ->first();
+ if (!$priceSetExtendsMembership) {
+ $errors['member_is_active'] = ts('You cannot enable both Membership Signup and a Contribution Price Set on the same online contribution page.');
+ return $errors;
}
if (!empty($params['member_price_set_id'])) {
diff --git a/civicrm/CRM/Member/Tokens.php b/civicrm/CRM/Member/Tokens.php
index a7549ee796..6def09ac86 100644
--- a/civicrm/CRM/Member/Tokens.php
+++ b/civicrm/CRM/Member/Tokens.php
@@ -129,6 +129,9 @@ class CRM_Member_Tokens extends CRM_Core_EntityTokens {
*/
protected function getRelatedTokens(): array {
$tokens = [];
+ if (!in_array('ContributionRecur', array_keys(\Civi::service('action_object_provider')->getEntities()))) {
+ return $tokens;
+ }
$hiddenTokens = ['modified_date', 'create_date', 'trxn_id', 'invoice_id', 'is_test', 'payment_token_id', 'payment_processor_id', 'payment_instrument_id', 'cycle_day', 'installments', 'processor_id', 'next_sched_contribution_date', 'failure_count', 'failure_retry_date', 'auto_renew', 'is_email_receipt', 'contribution_status_id'];
$contributionRecurFields = ContributionRecur::getFields(FALSE)->setLoadOptions(TRUE)->execute();
foreach ($contributionRecurFields as $contributionRecurField) {
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyFour.php b/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyFour.php
index 6c7492f65f..de98368586 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyFour.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyFour.php
@@ -63,6 +63,11 @@ class CRM_Upgrade_Incremental_php_FiveSixtyFour extends CRM_Upgrade_Incremental_
}
}
+ public function upgrade_5_64_1($rev): void {
+ // This index isn't really needed, and it was only created on some sites. See: dev/core#4472
+ $this->addTask('Drop "civicrm_acl.index_priority"', 'dropIndex', 'civicrm_acl', 'index_priority');
+ }
+
public static function updateLogging($ctx): bool {
if (\Civi::settings()->get('logging')) {
$dsn = defined('CIVICRM_LOGGING_DSN') ? CRM_Utils_SQL::autoSwitchDSN(CIVICRM_LOGGING_DSN) : CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php b/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php
index 02ac4664d7..44336fb31e 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php
@@ -23,9 +23,8 @@ class CRM_Upgrade_Incremental_php_FiveSixtyTwo extends CRM_Upgrade_Incremental_B
public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
if ($rev == '5.62.alpha1') {
- $rawComponentLists = CRM_Core_DAO::executeQuery('SELECT value, count(*) c FROM civicrm_setting WHERE name = "enable_components" GROUP BY value')
- ->fetchMap('value', 'value');
- $distinctComponentLists = array_unique(array_map(function(string $serializedList) {
+ $rawComponentLists = static::findEffectiveComponentsByDomain()->execute()->fetchMap('value', 'value');
+ $distinctComponentLists = array_unique(array_map(function(?string $serializedList) {
$list = \CRM_Utils_String::unserialize($serializedList);
sort($list);
return implode(',', $list);
@@ -127,8 +126,7 @@ class CRM_Upgrade_Incremental_php_FiveSixtyTwo extends CRM_Upgrade_Incremental_B
* Ex: ['CiviEvent', 'CiviMail']
*/
public static function findAllEnabledComponents(): array {
- $raw = CRM_Core_DAO::executeQuery('SELECT domain_id, value FROM civicrm_setting WHERE name = "enable_components"')
- ->fetchMap('domain_id', 'value');
+ $raw = static::findEffectiveComponentsByDomain()->execute()->fetchMap('domain_id', 'value');
$all = [];
foreach ($raw as $value) {
$all = array_unique(array_merge($all, \CRM_Utils_String::unserialize($value)));
@@ -136,4 +134,20 @@ class CRM_Upgrade_Incremental_php_FiveSixtyTwo extends CRM_Upgrade_Incremental_B
return array_values($all);
}
+ /**
+ * @return \CRM_Utils_SQL_Select
+ * SQL Query. Each row has a `domain_id,value` with the de-facto value of the `enable_component`
+ * setting in that domain.
+ */
+ private static function findEffectiveComponentsByDomain(): CRM_Utils_SQL_Select {
+ // Traditional list of components, as it existed circa 5.61.
+ $defaults = ['CiviEvent', 'CiviContribute', 'CiviMember', 'CiviMail', 'CiviReport', 'CiviPledge'];
+
+ return CRM_Utils_SQL_Select::from('civicrm_domain d')
+ ->join('civicrm_setting s', 'LEFT JOIN civicrm_setting s ON (d.id = s.domain_id AND s.name = "enable_components")')
+ ->select('d.id as domain_id, coalesce(s.value, @DEFAULT) as value')
+ ->param(['DEFAULT' => \serialize($defaults)]);
+
+ }
+
}
diff --git a/civicrm/Civi/Api4/EntitySet.php b/civicrm/Civi/Api4/EntitySet.php
index d8a82fcb05..b77fdae15a 100644
--- a/civicrm/Civi/Api4/EntitySet.php
+++ b/civicrm/Civi/Api4/EntitySet.php
@@ -48,7 +48,9 @@ class EntitySet extends Generic\AbstractEntity {
}
public static function permissions() {
- return [];
+ return [
+ 'get' => [],
+ ];
}
/**
diff --git a/civicrm/Civi/Api4/Utils/FormattingUtil.php b/civicrm/Civi/Api4/Utils/FormattingUtil.php
index 380a7afc94..48f650e338 100644
--- a/civicrm/Civi/Api4/Utils/FormattingUtil.php
+++ b/civicrm/Civi/Api4/Utils/FormattingUtil.php
@@ -446,7 +446,7 @@ class FormattingUtil {
* @return array
*/
public static function filterByPath(array $values, string $fieldPath, string $fieldName): array {
- $prefix = substr($fieldPath, 0, strpos($fieldPath, $fieldName));
+ $prefix = substr($fieldPath, 0, strrpos($fieldPath, $fieldName));
return \CRM_Utils_Array::filterByPrefix($values, $prefix);
}
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 7e1d7a1896..f58704104f 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.64.0',
+ return array( 'version' => '5.64.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index b5a7291146..66da3cb1ed 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.64.0</version>
+ <version>5.64.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 69b576d5ef..4d0cea40d1 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.64.0</version>
+ <version>5.64.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 6b9af6f9eb..53722b38de 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.64.0</version>
+ <version>5.64.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index 4362ca127d..ae5ad75d72 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.64.0</version>
+ <version>5.64.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index d713d826b6..22900f5def 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/civi_campaign/info.xml b/civicrm/ext/civi_campaign/info.xml
index b3a9eda988..a0619a4cef 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.64.0</version>
+ <version>5.64.1</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 7722cf3052..b19bb7c731 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.64.0</version>
+ <version>5.64.1</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 ed7877c53a..6253c90b26 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.64.0</version>
+ <version>5.64.1</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 e92f9f409f..c09a70ba3a 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.64.0</version>
+ <version>5.64.1</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 ab7b5d5253..fa1f469c73 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.64.0</version>
+ <version>5.64.1</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 897df97629..c0e9b6d430 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.64.0</version>
+ <version>5.64.1</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 a83bb97994..9293339469 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.64.0</version>
+ <version>5.64.1</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 71cc6df076..a1805a7bc7 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.64.0</version>
+ <version>5.64.1</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 d378cb8f8a..2076f433c6 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.64.0</version>
+ <version>5.64.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 2b878c4e30..b3a219e573 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index 25e55a38a0..5f45727491 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.64.0</version>
+ <version>5.64.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 72c68b9585..f67bfa541f 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index edc985f498..8e46462a63 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index 577030701d..69e98f0b00 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index e4be3891d7..e82b737176 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.64.0</version>
+ <version>5.64.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index a645be084e..82d327dc70 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.64.0</version>
+ <version>5.64.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 911eb7468f..3219368db9 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index bbf38a6c62..59c0865cde 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.64.0</version>
+ <version>5.64.1</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 bd5999ec85..1fd46a01e5 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.64.0</version>
+ <version>5.64.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index fdfca4fd35..ac3bd40087 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml
index e4fafa40d7..25536fe814 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.64.0</version>
+ <version>5.64.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index 324ca352cf..75557d6145 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 56ec8a0773..eb034a48d4 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index caebedd59a..274b62aa2c 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.64.0</version>
+ <version>5.64.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index fe1bcc43f4..43124e9285 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.64.0</version>
+ <version>5.64.1</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index bd1ed8b5b9..d8e4fa4812 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.64.0</version>
+ <version>5.64.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/standaloneusers/info.xml b/civicrm/ext/standaloneusers/info.xml
index d8aae56be5..d04850272d 100644
--- a/civicrm/ext/standaloneusers/info.xml
+++ b/civicrm/ext/standaloneusers/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-11-11</releaseDate>
- <version>5.64.0</version>
+ <version>5.64.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.64</ver>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index a52acdc4c8..b4bd33b2e6 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.64.1
+
+Released August 18, 2023
+
+- **[Synopsis](release-notes/5.64.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.64.1.md#bugs)**
+- **[Credits](release-notes/5.64.1.md#credits)**
+- **[Feedback](release-notes/5.64.1.md#feedback)**
+
## CiviCRM 5.64.0
Released August 2, 2023
diff --git a/civicrm/release-notes/5.64.1.md b/civicrm/release-notes/5.64.1.md
new file mode 100644
index 0000000000..c85c70c156
--- /dev/null
+++ b/civicrm/release-notes/5.64.1.md
@@ -0,0 +1,44 @@
+# CiviCRM 5.64.1
+
+Released August 18, 2023
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+| --------------------------------------------------------------- | -------- |
+| **Change the database schema?** | **yes** |
+| Alter the API? | no |
+| Require attention to configuration options? | no |
+| **Fix problems installing or upgrading to a previous version?** | **yes** |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+| Fix security vulnerabilities? | no |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviEvent_: Warning when sending offline receipt ([dev/core#4494](https://lab.civicrm.org/dev/core/-/issues/4494): [#27066](https://github.com/civicrm/civicrm-core/pull/27066))**
+* **_CiviMail_: Selecting a recipient requires administrator permissions ([dev/core#4498](https://lab.civicrm.org/dev/core/-/issues/4498): [#27071](https://github.com/civicrm/civicrm-core/pull/27071))**
+* **_CiviMember_: Cannot change "Membership Price Set" on a contribution page ([dev/core#4486](https://lab.civicrm.org/dev/core/-/issues/4486): [#27079](https://github.com/civicrm/civicrm-core/pull/27079), [#27080](https://github.com/civicrm/civicrm-core/pull/27080), [#27083](https://github.com/civicrm/civicrm-core/pull/27083))**
+* **_Scheduled Reminders_: Administration screen doesn't open if CiviContribute is disabled ([dev/core#4492](https://lab.civicrm.org/dev/core/-/issues/4492): [#27043](https://github.com/civicrm/civicrm-core/pull/27043))**
+* **_Schema_: Drop inconsistent and unnecesary index ([dev/core#4472](https://lab.civicrm.org/dev/core/-/issues/4472): [#27088](https://github.com/civicrm/civicrm-core/pull/27088))**
+* **_Search Kit_: In-place editing fails for joined fields ([dev/core#4483](https://lab.civicrm.org/dev/core/-/issues/4483): [#27033](https://github.com/civicrm/civicrm-core/pull/27033))**
+* **_Upgrade_: List of active "Components" becomes empty on some sites ([#27075](https://github.com/civicrm/civicrm-core/pull/27075))**
+
+## <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, Brienne Kordis; JMA Consulting - Seamus Lee; Dave D;
+Coop SymbioTIC - Mathieu Lutfy; CiviCRM - Coleman Watts, Tim Otten; CiviCoop - Jaap Jansma
+
+## <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.mysql b/civicrm/sql/civicrm.mysql
index d7bd8ba8da..fbf2133cb0 100644
--- a/civicrm/sql/civicrm.mysql
+++ b/civicrm/sql/civicrm.mysql
@@ -449,8 +449,7 @@ CREATE TABLE `civicrm_acl` (
`is_active` tinyint COMMENT 'Is this property active?',
`priority` int NOT NULL DEFAULT 0,
PRIMARY KEY (`id`),
- INDEX `index_acl_id`(acl_id),
- INDEX `index_priority`(priority)
+ INDEX `index_acl_id`(acl_id)
)
ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index 1939bafbc7..4de6890733 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23952,4 +23952,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.64.0';
+UPDATE civicrm_domain SET version = '5.64.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index b6934f7649..46e9a776f7 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2959,7 +2959,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.64.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.64.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 2d0cc3165e..aa52ea0fe7 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit71b9838e6c044eb6c784cc7ca1f0b85d::getLoader();
+return ComposerAutoloaderInit017fad674e36ad6b8de89e88350144e1::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 5aec6fdab5..070140adc5 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 ComposerAutoloaderInit71b9838e6c044eb6c784cc7ca1f0b85d
+class ComposerAutoloaderInit017fad674e36ad6b8de89e88350144e1
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInit71b9838e6c044eb6c784cc7ca1f0b85d
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit71b9838e6c044eb6c784cc7ca1f0b85d', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit017fad674e36ad6b8de89e88350144e1', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInit71b9838e6c044eb6c784cc7ca1f0b85d', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit017fad674e36ad6b8de89e88350144e1', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInit71b9838e6c044eb6c784cc7ca1f0b85d
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit017fad674e36ad6b8de89e88350144e1::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInit71b9838e6c044eb6c784cc7ca1f0b85d
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit017fad674e36ad6b8de89e88350144e1::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire71b9838e6c044eb6c784cc7ca1f0b85d($fileIdentifier, $file);
+ composerRequire017fad674e36ad6b8de89e88350144e1($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInit71b9838e6c044eb6c784cc7ca1f0b85d
* @param string $file
* @return void
*/
-function composerRequire71b9838e6c044eb6c784cc7ca1f0b85d($fileIdentifier, $file)
+function composerRequire017fad674e36ad6b8de89e88350144e1($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 336118f709..e5db882f22 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d
+class ComposerStaticInit017fad674e36ad6b8de89e88350144e1
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -729,11 +729,11 @@ class ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit71b9838e6c044eb6c784cc7ca1f0b85d::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit017fad674e36ad6b8de89e88350144e1::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit017fad674e36ad6b8de89e88350144e1::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit017fad674e36ad6b8de89e88350144e1::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit017fad674e36ad6b8de89e88350144e1::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit017fad674e36ad6b8de89e88350144e1::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index 3642e445dd..f2764b3b02 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' => '16df6f2f20637a03b8b885256bb01450c26b4009',
+ 'reference' => 'd44c33e641546d1b1cbac0e8230b7c780fca321d',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -43,7 +43,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '16df6f2f20637a03b8b885256bb01450c26b4009',
+ 'reference' => 'd44c33e641546d1b1cbac0e8230b7c780fca321d',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/schema/ACL/ACL.xml b/civicrm/xml/schema/ACL/ACL.xml
index a4369a2d71..8f95880b5d 100644
--- a/civicrm/xml/schema/ACL/ACL.xml
+++ b/civicrm/xml/schema/ACL/ACL.xml
@@ -160,8 +160,4 @@
<type>Number</type>
</html>
</field>
- <index>
- <name>index_priority</name>
- <fieldName>priority</fieldName>
- </index>
</table>
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index f1903ca5a7..399c2192a6 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.64.0</version_no>
+ <version_no>5.64.1</version_no>
</version>
--
GitLab