From f6b9e7b89fc7f7e327899cd9f4a88ea66ccfe51d Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Tue, 28 Nov 2023 07:35:56 -0500
Subject: [PATCH] civicrm release-5.67.2
---
civicrm.php | 4 +-
.../CRM/Contribute/DAO/ContributionPage.php | 4 +-
.../CRM/Contribute/xml/Menu/Contribute.xml | 2 +-
civicrm/CRM/Core/BAO/UserJob.php | 7 ++-
civicrm/CRM/Event/Form/Registration.php | 15 ++++++-
civicrm/CRM/Utils/Date.php | 2 +-
civicrm/CRM/Utils/Mail/EmailProcessor.php | 9 +++-
civicrm/CRM/Utils/Mail/IncomingMail.php | 2 +-
.../AutocompleteFieldSubscriber.php | 5 +++
.../Civi/Api4/Generic/AutocompleteAction.php | 4 ++
.../Api4/Query/SqlFunctionGROUP_CONCAT.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 +-
...edSearch_Manage_Contribution_Pages.mgd.php | 5 ++-
civicrm/ext/civicrm_search_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/scheduled_communications/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.67.2.md | 45 +++++++++++++++++++
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
.../CRM/Contribute/Page/ContributionPage.tpl | 2 +-
.../CRM/Event/Form/Registration/Register.tpl | 4 +-
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 +-
.../schema/Contribute/ContributionPage.xml | 2 +-
civicrm/xml/version.xml | 2 +-
59 files changed, 158 insertions(+), 73 deletions(-)
create mode 100644 civicrm/release-notes/5.67.2.md
diff --git a/civicrm.php b/civicrm.php
index 582916aefc..91d1ce06b9 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.67.1
+ * Version: 5.67.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.67.1');
+define('CIVICRM_PLUGIN_VERSION', '5.67.2');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Contribute/DAO/ContributionPage.php b/civicrm/CRM/Contribute/DAO/ContributionPage.php
index 7ce4c8cc85..788b6b26f3 100644
--- a/civicrm/CRM/Contribute/DAO/ContributionPage.php
+++ b/civicrm/CRM/Contribute/DAO/ContributionPage.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/ContributionPage.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:84e81e764d43c0d0116ae54d90a18a84)
+ * (GenCodeChecksum:8c1f3262364d5a5f1255e1f0eb4bf690)
*/
/**
@@ -46,7 +46,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
protected static $_paths = [
'add' => 'civicrm/admin/contribute/add?reset=1&action=add',
'update' => 'civicrm/admin/contribute/settings?reset=1&action=update&id=[id]',
- 'delete' => 'civicrm/admin/contribute?reset=1&action=delete&id=[id]',
+ 'delete' => 'civicrm/admin/contribute/manage?reset=1&action=delete&id=[id]',
'browse' => 'civicrm/admin/contribute',
];
diff --git a/civicrm/CRM/Contribute/xml/Menu/Contribute.xml b/civicrm/CRM/Contribute/xml/Menu/Contribute.xml
index 77b12723e4..1757c746a6 100644
--- a/civicrm/CRM/Contribute/xml/Menu/Contribute.xml
+++ b/civicrm/CRM/Contribute/xml/Menu/Contribute.xml
@@ -201,7 +201,7 @@
<weight>588</weight>
</item>
<item>
- <path>civicrm/contribute/manage</path>
+ <path>civicrm/admin/contribute/manage</path>
<title>Manage Contribution Pages</title>
<page_callback>CRM_Contribute_Page_ContributionPage</page_callback>
<access_arguments>administer CiviCRM,access CiviContribute</access_arguments>
diff --git a/civicrm/CRM/Core/BAO/UserJob.php b/civicrm/CRM/Core/BAO/UserJob.php
index a6ba558f83..8f572fa54d 100644
--- a/civicrm/CRM/Core/BAO/UserJob.php
+++ b/civicrm/CRM/Core/BAO/UserJob.php
@@ -154,10 +154,9 @@ class CRM_Core_BAO_UserJob extends CRM_Core_DAO_UserJob implements HookInterface
*/
public function addSelectWhereClause(string $entityName = NULL, int $userId = NULL, array $conditions = []): array {
$clauses = [];
- if (!\CRM_Core_Permission::check('administer queues')) {
- // @todo - the is_template should really be prefixed. We need to add support
- // for that in the compiler & then this would be `{table}.is_template`
- $clauses['created_id'] = '= ' . (int) CRM_Core_Session::getLoggedInContactID() . ' OR is_template = 1';
+ if (!\CRM_Core_Permission::check('administer queues', $userId)) {
+ // Only allow access to users' own jobs (or templates)
+ $clauses['created_id'][] = '= ' . (int) CRM_Core_Session::getLoggedInContactID() . ' OR {is_template} = 1';
}
CRM_Utils_Hook::selectWhereClause($this, $clauses, $userId, $conditions);
return $clauses;
diff --git a/civicrm/CRM/Event/Form/Registration.php b/civicrm/CRM/Event/Form/Registration.php
index b33f7ee18e..1553c2b031 100644
--- a/civicrm/CRM/Event/Form/Registration.php
+++ b/civicrm/CRM/Event/Form/Registration.php
@@ -504,8 +504,11 @@ class CRM_Event_Form_Registration extends CRM_Core_Form {
* @param string $name
*/
public function buildCustom($id, $name) {
+ if ($name === 'customPost') {
+ $this->assign('postPageProfiles', []);
+ }
+ $this->assign($name, []);
if (!$id) {
- $this->assign($name, []);
return;
}
@@ -564,6 +567,16 @@ class CRM_Event_Form_Registration extends CRM_Core_Form {
) {
CRM_Core_BAO_Address::checkContactSharedAddressFields($fields, $contactID);
}
+ if ($name === 'customPost') {
+ $postPageProfiles = [];
+ foreach ($fields as $fieldName => $field) {
+ $postPageProfiles[$field['groupName']][$fieldName] = $field;
+ }
+ $this->assign('postPageProfiles', $postPageProfiles);
+ }
+ // We still assign the customPost in the way we used to because we haven't ruled out being
+ // used after the register form - but in the register form it is overwritten by a for-each
+ // with the smarty code.
$this->assign($name, $fields);
if (is_array($fields)) {
$button = substr($this->controller->getButtonName(), -4);
diff --git a/civicrm/CRM/Utils/Date.php b/civicrm/CRM/Utils/Date.php
index 2434fb33e0..dfcff429c3 100644
--- a/civicrm/CRM/Utils/Date.php
+++ b/civicrm/CRM/Utils/Date.php
@@ -1987,7 +1987,7 @@ class CRM_Utils_Date {
$field['smarty_view_format'] = $dateAttributes['smarty_view_format'];
}
$field['datepicker']['extra'] = self::getDatePickerExtra($field);
- $field['datepicker']['extra']['time'] = $fieldMetaData['type'] == CRM_Utils_Type::T_TIMESTAMP;
+ $field['datepicker']['extra']['time'] = $fieldMetaData['type'] == CRM_Utils_Type::T_TIMESTAMP || $fieldMetaData['type'] == (CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME);
$field['datepicker']['attributes'] = self::getDatePickerAttributes($field);
}
}
diff --git a/civicrm/CRM/Utils/Mail/EmailProcessor.php b/civicrm/CRM/Utils/Mail/EmailProcessor.php
index 813dc1d15a..edc5a3aeb4 100644
--- a/civicrm/CRM/Utils/Mail/EmailProcessor.php
+++ b/civicrm/CRM/Utils/Mail/EmailProcessor.php
@@ -118,7 +118,14 @@ class CRM_Utils_Mail_EmailProcessor {
// process fifty at a time, CRM-4002
while ($mails = $store->fetchNext(MAIL_BATCH_SIZE)) {
foreach ($mails as $key => $mail) {
- $incomingMail = new CRM_Utils_Mail_IncomingMail($mail, (string) $dao->domain, (string) $dao->localpart);
+ try {
+ $incomingMail = new CRM_Utils_Mail_IncomingMail($mail, (string) $dao->domain, (string) $dao->localpart);
+ }
+ catch (CRM_Core_Exception $e) {
+ $store->markIgnored($key);
+ continue;
+ }
+
$action = $incomingMail->getAction();
$job = $incomingMail->getJobID();
$queue = $incomingMail->getQueueID();
diff --git a/civicrm/CRM/Utils/Mail/IncomingMail.php b/civicrm/CRM/Utils/Mail/IncomingMail.php
index 4bd444bb35..47177d12fe 100644
--- a/civicrm/CRM/Utils/Mail/IncomingMail.php
+++ b/civicrm/CRM/Utils/Mail/IncomingMail.php
@@ -217,7 +217,7 @@ class CRM_Utils_Mail_IncomingMail {
'id' => $queue->id,
'hash' => $queue->hash,
'contact_id' => $queue->contact_id,
- 'job_id' => $queue->contact_id,
+ 'job_id' => $queue->job_id,
]);
$this->define('Mailing', 'Mailing', [
'id' => MailingJob::get(FALSE)
diff --git a/civicrm/Civi/Api4/Event/Subscriber/AutocompleteFieldSubscriber.php b/civicrm/Civi/Api4/Event/Subscriber/AutocompleteFieldSubscriber.php
index 3943c2a299..05d955740f 100644
--- a/civicrm/Civi/Api4/Event/Subscriber/AutocompleteFieldSubscriber.php
+++ b/civicrm/Civi/Api4/Event/Subscriber/AutocompleteFieldSubscriber.php
@@ -67,6 +67,11 @@ class AutocompleteFieldSubscriber extends AutoService implements EventSubscriber
$apiRequest->addFilter($key, $value);
}
+ // Autocomplete for field with option values
+ if ($apiRequest->getEntityName() === 'OptionValue' && !empty($fieldSpec['custom_field_id'])) {
+ $apiRequest->setKey('value');
+ }
+
if ($formType === 'qf') {
$this->autocompleteProfilePermissions($apiRequest, $formName, $fieldSpec);
}
diff --git a/civicrm/Civi/Api4/Generic/AutocompleteAction.php b/civicrm/Civi/Api4/Generic/AutocompleteAction.php
index fe87afe8d2..d50c62f9f3 100644
--- a/civicrm/Civi/Api4/Generic/AutocompleteAction.php
+++ b/civicrm/Civi/Api4/Generic/AutocompleteAction.php
@@ -285,6 +285,10 @@ class AutocompleteAction extends AbstractAction {
*/
private function getKeyField() {
$entityName = $this->savedSearch['api_entity'];
+ // Temp hack for 5.67. Fixed in 5.68. See https://github.com/civicrm/civicrm-core/pull/28283
+ if ($entityName === 'OptionValue' && $this->key === 'value') {
+ return 'value';
+ }
if ($this->key) {
/** @var \CRM_Core_DAO $dao */
$dao = CoreUtil::getInfoItem($entityName, 'dao');
diff --git a/civicrm/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php b/civicrm/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php
index a4254ae72a..cc1fd222d5 100644
--- a/civicrm/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php
+++ b/civicrm/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php
@@ -25,7 +25,7 @@ class SqlFunctionGROUP_CONCAT extends SqlFunction {
protected static function params(): array {
return [
[
- 'flag_before' => ['' => NULL, 'DISTINCT' => ts('Distinct Value'), 'UNIQUE' => ts('Unique Record')],
+ 'flag_before' => ['' => ts('All'), 'DISTINCT' => ts('Distinct Value'), 'UNIQUE' => ts('Unique Record')],
'max_expr' => 1,
'must_be' => ['SqlField', 'SqlFunction', 'SqlEquation'],
'optional' => FALSE,
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 87c7b77fab..4a8590746d 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.67.1',
+ return array( 'version' => '5.67.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 59aff5bc09..c64338355a 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.67.1</version>
+ <version>5.67.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 88a9e06301..2472bd3464 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.67.1</version>
+ <version>5.67.2</version>
<compatibility>
<ver>5.67</ver>
</compatibility>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 91cdc58242..b786160119 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.67.1</version>
+ <version>5.67.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index 60b5baec5f..9eb4b36cfe 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.67.1</version>
+ <version>5.67.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 1d7d6c9323..4b3f644a34 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/civi_campaign/info.xml b/civicrm/ext/civi_campaign/info.xml
index afe15abe5e..8be2ea3c06 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.67.1</version>
+ <version>5.67.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 7a89beaca6..e31981c4ec 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.67.1</version>
+ <version>5.67.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 c63d22e269..5ee57c0067 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.67.1</version>
+ <version>5.67.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 c0e2ea5d07..cdace83190 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.67.1</version>
+ <version>5.67.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 69f5727dd6..e78ba05daa 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.67.1</version>
+ <version>5.67.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 d325809205..ed75efc1f1 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.67.1</version>
+ <version>5.67.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 a40a19a6d7..599b37f688 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.67.1</version>
+ <version>5.67.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 5d58c5ab76..f8e807331d 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.67.1</version>
+ <version>5.67.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 f606dcc651..c32766c7e6 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.67.1</version>
+ <version>5.67.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php b/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
index d263bece39..c2504145a9 100644
--- a/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
+++ b/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
@@ -200,7 +200,7 @@ return [
'condition' => [],
],
[
- 'path' => 'civicrm/admin/contribute?action=copy&gid=[id]',
+ 'path' => 'civicrm/admin/contribute/manage?action=copy&gid=[id]',
'icon' => 'fa-clone',
'text' => E::ts('Clone'),
'style' => 'secondary',
@@ -230,7 +230,7 @@ return [
],
[
'entity' => 'ContributionPage',
- 'action' => 'delete',
+ 'action' => '',
'join' => '',
'target' => 'crm-popup',
'icon' => 'fa-trash',
@@ -238,6 +238,7 @@ return [
'style' => 'danger',
'path' => '',
'condition' => [],
+ 'task' => 'delete',
],
],
'type' => 'buttons',
diff --git a/civicrm/ext/civicrm_search_ui/info.xml b/civicrm/ext/civicrm_search_ui/info.xml
index 04946eeaaa..69dd7916df 100644
--- a/civicrm/ext/civicrm_search_ui/info.xml
+++ b/civicrm/ext/civicrm_search_ui/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-07-17</releaseDate>
- <version>5.67.1</version>
+ <version>5.67.2</version>
<develStage>alpha</develStage>
<requires>
<ext>org.civicrm.search_kit</ext>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 6f1b8a82eb..e190f0b78b 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index 859372dd4b..07a39ba7b8 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.67.1</version>
+ <version>5.67.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 53b8bf50bc..aa2810b79d 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index a4b5966115..8d7337a9c4 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index 8f08d833e0..cc0201a520 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 591eb33b46..49fca0c7dc 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.67.1</version>
+ <version>5.67.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 42990fa584..34966cb2ff 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.67.1</version>
+ <version>5.67.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 4748f244ed..a38641df81 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 414076a81f..650ecc16af 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.67.1</version>
+ <version>5.67.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 c8eb597378..01d6dbfb02 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.67.1</version>
+ <version>5.67.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 2b9df5862b..e81708a1fd 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml
index 69995a6b0b..f2add816b4 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.67.1</version>
+ <version>5.67.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index 7c753aadac..d1f00d96b3 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 327c12973f..a97a8fd886 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.67.1</version>
+ <version>5.67.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 9aa5e2d3b4..a778f5fa45 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.67.1</version>
+ <version>5.67.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/scheduled_communications/info.xml b/civicrm/ext/scheduled_communications/info.xml
index d14518df42..a02b8a22ee 100644
--- a/civicrm/ext/scheduled_communications/info.xml
+++ b/civicrm/ext/scheduled_communications/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-09-04</releaseDate>
- <version>5.67.1</version>
+ <version>5.67.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 42779bd9e7..dfdfde5655 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.67.1</version>
+ <version>5.67.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 326d6fdd67..20f7e76b06 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.67.1</version>
+ <version>5.67.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/standaloneusers/info.xml b/civicrm/ext/standaloneusers/info.xml
index 452f264d52..f9ca3c9dc8 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.67.1</version>
+ <version>5.67.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.67</ver>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 2eb7202462..1542bb8b7e 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.67.2
+
+Released November 28, 2023
+
+- **[Synopsis](release-notes/5.67.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.67.2.md#bugs)**
+- **[Credits](release-notes/5.67.2.md#credits)**
+- **[Feedback](release-notes/5.67.2.md#feedback)**
+
## CiviCRM 5.67.1
Released November 15, 2023
diff --git a/civicrm/release-notes/5.67.2.md b/civicrm/release-notes/5.67.2.md
new file mode 100644
index 0000000000..8e4e81b5d0
--- /dev/null
+++ b/civicrm/release-notes/5.67.2.md
@@ -0,0 +1,45 @@
+# CiviCRM 5.67.2
+
+Released November 28, 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
+
+* **_CiviContribute_: Field "Contribution date" does not appear in "Edit" mode ([dev/financial#221](https://lab.civicrm.org/dev/financial/-/issues/221): [#28243](https://github.com/civicrm/civicrm-core/pull/28243))**
+* **_CiviContribute_: With "Admin UI" extension, some actions don't work ([#28189](https://github.com/civicrm/civicrm-core/pull/28189))**
+* **_CiviEvent_: Registration screen with multiple profiles does not display correctly ([dev/core#4766](https://lab.civicrm.org/dev/core/-/issues/4766): [#28246](https://github.com/civicrm/civicrm-core/pull/28246))**
+* **_CiviMail_: Improper bounce-messages should fail gracefully ([dev/core#4780](https://lab.civicrm.org/dev/core/-/issues/4780): [#28192](https://github.com/civicrm/civicrm-core/pull/28192))**
+* **_Custom Fields_: Certain custom fields do not display correctly ([dev/core#4799](https://lab.civicrm.org/dev/core/-/issues/4799): [#28283](https://github.com/civicrm/civicrm-core/pull/28283))**
+* **_Import (et al)_: Fix new and extraneous notice for certain users ([#28325](https://github.com/civicrm/civicrm-core/pull/28325))**
+* **_Inbound Mail_: Fix new (but inconsistent) metadata ([#28244](https://github.com/civicrm/civicrm-core/pull/28244))**
+* **_Search Kit_: Fix missing label for `GROUP_CONCAT` function ([#28187](https://github.com/civicrm/civicrm-core/pull/28187))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Squiffle Consulting - Aidan Saunders; Megaphone
+Technology Consulting - Brienne Kordis; Lighthouse Consulting and Design - Brian
+Shaughnessy; Dave D; CiviCRM - Coleman Watts; Agileware - Justin Freeman
+
+## <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 88717a1d28..b008d34a57 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23580,4 +23580,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.67.1';
+UPDATE civicrm_domain SET version = '5.67.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 95d397236d..2d6205e841 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2970,7 +2970,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.67.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.67.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/Contribute/Page/ContributionPage.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
index f3fd1af036..1a2b77367c 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
@@ -88,7 +88,7 @@
{if $isSearch eq 1}
<div class="status messages">
<img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
- {capture assign=browseURL}{crmURL p='civicrm/contribute/manage' q="reset=1"}{/capture}
+ {capture assign=browseURL}{crmURL p='civicrm/admin/contribute/manage' q="reset=1"}{/capture}
{ts}No available Contribution Pages match your search criteria. Suggestions:{/ts}
<div class="spacer"></div>
<ul>
diff --git a/civicrm/templates/CRM/Event/Form/Registration/Register.tpl b/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
index 496581b3eb..747a74e154 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
@@ -135,7 +135,9 @@
{/if}
<div class="crm-public-form-item crm-section custom_post-section">
- {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
+ {foreach from=$postPageProfiles item=customPost}
+ {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
+ {/foreach}
</div>
<div id="crm-submit-buttons" class="crm-submit-buttons">
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 76e0e2c028..7d4e7bbf6a 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit299545d8663dedab9b6feed155a47593::getLoader();
+return ComposerAutoloaderInitaaaec4094b2333d842e31c30509e73f6::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 755285292a..a9564d1a34 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 ComposerAutoloaderInit299545d8663dedab9b6feed155a47593
+class ComposerAutoloaderInitaaaec4094b2333d842e31c30509e73f6
{
private static $loader;
@@ -24,22 +24,22 @@ class ComposerAutoloaderInit299545d8663dedab9b6feed155a47593
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit299545d8663dedab9b6feed155a47593', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitaaaec4094b2333d842e31c30509e73f6', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
- spl_autoload_unregister(array('ComposerAutoloaderInit299545d8663dedab9b6feed155a47593', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitaaaec4094b2333d842e31c30509e73f6', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
set_include_path(implode(PATH_SEPARATOR, $includePaths));
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit299545d8663dedab9b6feed155a47593::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::getInitializer($loader));
$loader->register(true);
- $includeFiles = \Composer\Autoload\ComposerStaticInit299545d8663dedab9b6feed155a47593::$files;
+ $includeFiles = \Composer\Autoload\ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire299545d8663dedab9b6feed155a47593($fileIdentifier, $file);
+ composerRequireaaaec4094b2333d842e31c30509e73f6($fileIdentifier, $file);
}
return $loader;
@@ -51,7 +51,7 @@ class ComposerAutoloaderInit299545d8663dedab9b6feed155a47593
* @param string $file
* @return void
*/
-function composerRequire299545d8663dedab9b6feed155a47593($fileIdentifier, $file)
+function composerRequireaaaec4094b2333d842e31c30509e73f6($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 020c735606..6e94ff5741 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit299545d8663dedab9b6feed155a47593
+class ComposerStaticInitaaaec4094b2333d842e31c30509e73f6
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -729,11 +729,11 @@ class ComposerStaticInit299545d8663dedab9b6feed155a47593
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit299545d8663dedab9b6feed155a47593::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit299545d8663dedab9b6feed155a47593::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit299545d8663dedab9b6feed155a47593::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit299545d8663dedab9b6feed155a47593::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit299545d8663dedab9b6feed155a47593::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index 3c44695f6b..365b6a2a77 100644
--- a/civicrm/vendor/composer/installed.php
+++ b/civicrm/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'civicrm/civicrm-core',
'pretty_version' => '5.67.x-dev',
'version' => '5.67.9999999.9999999-dev',
- 'reference' => 'debcc7374594566ab1505a8cec30cb19e8ee34ba',
+ 'reference' => '96087db59731da8ba882203be81beeedacdec2a1',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -40,7 +40,7 @@
'civicrm/civicrm-core' => array(
'pretty_version' => '5.67.x-dev',
'version' => '5.67.9999999.9999999-dev',
- 'reference' => 'debcc7374594566ab1505a8cec30cb19e8ee34ba',
+ 'reference' => '96087db59731da8ba882203be81beeedacdec2a1',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/civicrm/xml/schema/Contribute/ContributionPage.xml b/civicrm/xml/schema/Contribute/ContributionPage.xml
index c0e030b048..92feacda65 100644
--- a/civicrm/xml/schema/Contribute/ContributionPage.xml
+++ b/civicrm/xml/schema/Contribute/ContributionPage.xml
@@ -12,7 +12,7 @@
<paths>
<add>civicrm/admin/contribute/add?reset=1&action=add</add>
<update>civicrm/admin/contribute/settings?reset=1&action=update&id=[id]</update>
- <delete>civicrm/admin/contribute?reset=1&action=delete&id=[id]</delete>
+ <delete>civicrm/admin/contribute/manage?reset=1&action=delete&id=[id]</delete>
<browse>civicrm/admin/contribute</browse>
</paths>
<field>
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index e59ae0b395..0dc367fc07 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.67.1</version_no>
+ <version_no>5.67.2</version_no>
</version>
--
GitLab