From c264776c02522fa64b4221639e2a57fb05f268e7 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Tue, 31 Jan 2023 07:32:56 -0500
Subject: [PATCH] civicrm release-5.57.3
---
civicrm.php | 4 +-
.../CRM/Contribute/BAO/ContributionSoft.php | 2 +-
.../Event/BAO/MailingEventResubscribe.php | 4 +-
civicrm/CRM/Mailing/Page/Common.php | 4 +-
civicrm/api/v3/MailingEventResubscribe.php | 4 +-
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/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 +-
.../Financialacls/ContributionSoftTest.php | 4 +-
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.57.3.md | 38 +++++++++++++++++++
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/include_paths.php | 2 +-
civicrm/vendor/composer/installed.php | 4 +-
civicrm/xml/version.xml | 2 +-
40 files changed, 103 insertions(+), 54 deletions(-)
create mode 100644 civicrm/release-notes/5.57.3.md
diff --git a/civicrm.php b/civicrm.php
index ef6f04f1ec..76f1df45cd 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.57.2
+ * Version: 5.57.3
* Requires at least: 4.9
* Requires PHP: 7.2
* 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.57.2');
+define('CIVICRM_PLUGIN_VERSION', '5.57.3');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Contribute/BAO/ContributionSoft.php b/civicrm/CRM/Contribute/BAO/ContributionSoft.php
index a38c720204..2e0115bec9 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionSoft.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionSoft.php
@@ -409,7 +409,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio
];
$contributionSofts = ContributionSoft::get()
- ->addSelect('*', 'contribution_id.receive_date', 'contribution_id.contact_id', 'contribution_id.contact_id.display_name', 'soft_credit_type_id:label', 'contribution_id.contribution_status_id:label', 'contribution_id.financial_type_id:label', 'pcp_id.title')
+ ->addSelect('*', 'contribution_id.receive_date', 'contribution_id.contact_id', 'contribution_id.contact_id.display_name', 'soft_credit_type_id:label', 'contribution_id.contribution_status_id:label', 'contribution_id.financial_type_id:label', 'pcp_id.title', 'row_count')
->addWhere('contact_id', '=', $contact_id)
->addWhere('contribution_id.is_test', '=', $isTest);
diff --git a/civicrm/CRM/Mailing/Event/BAO/MailingEventResubscribe.php b/civicrm/CRM/Mailing/Event/BAO/MailingEventResubscribe.php
index be7637215b..0e6db580ac 100644
--- a/civicrm/CRM/Mailing/Event/BAO/MailingEventResubscribe.php
+++ b/civicrm/CRM/Mailing/Event/BAO/MailingEventResubscribe.php
@@ -20,9 +20,9 @@ use Civi\Token\TokenProcessor;
require_once 'Mail/mime.php';
/**
- * Class CRM_Mailing_Event_BAO_Resubscribe
+ * Class CRM_Mailing_Event_BAO_MailingEventResubscribe
*/
-class CRM_Mailing_Event_BAO_Resubscribe {
+class CRM_Mailing_Event_BAO_MailingEventResubscribe {
/**
* Resubscribe a contact to the groups, he/she was unsubscribed from.
diff --git a/civicrm/CRM/Mailing/Page/Common.php b/civicrm/CRM/Mailing/Page/Common.php
index dac1304e9d..70ccd7f6cd 100644
--- a/civicrm/CRM/Mailing/Page/Common.php
+++ b/civicrm/CRM/Mailing/Page/Common.php
@@ -77,9 +77,9 @@ class CRM_Mailing_Page_Common extends CRM_Core_Page {
}
}
elseif ($this->_type == 'resubscribe') {
- $groups = CRM_Mailing_Event_BAO_Resubscribe::resub_to_mailing($job_id, $queue_id, $hash);
+ $groups = CRM_Mailing_Event_BAO_MailingEventResubscribe::resub_to_mailing($job_id, $queue_id, $hash);
if (count($groups)) {
- CRM_Mailing_Event_BAO_Resubscribe::send_resub_response($queue_id, $groups, $job_id);
+ CRM_Mailing_Event_BAO_MailingEventResubscribe::send_resub_response($queue_id, $groups, $job_id);
}
else {
// should we indicate an error, or just ignore?
diff --git a/civicrm/api/v3/MailingEventResubscribe.php b/civicrm/api/v3/MailingEventResubscribe.php
index 1e5017caa4..1749b13156 100644
--- a/civicrm/api/v3/MailingEventResubscribe.php
+++ b/civicrm/api/v3/MailingEventResubscribe.php
@@ -26,14 +26,14 @@
*/
function civicrm_api3_mailing_event_resubscribe_create($params) {
- $groups = CRM_Mailing_Event_BAO_Resubscribe::resub_to_mailing(
+ $groups = CRM_Mailing_Event_BAO_MailingEventResubscribe::resub_to_mailing(
$params['job_id'],
$params['event_queue_id'],
$params['hash']
);
if (count($groups)) {
- CRM_Mailing_Event_BAO_Resubscribe::send_resub_response(
+ CRM_Mailing_Event_BAO_MailingEventResubscribe::send_resub_response(
$params['event_queue_id'],
$groups,
$params['job_id']
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 9f4912d330..51f6baf896 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.57.2',
+ return array( 'version' => '5.57.3',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 0818af6b54..52cfafc1ab 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.57.2</version>
+ <version>5.57.3</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 7cea730a6b..9f5ff9bb84 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.57.2</version>
+ <version>5.57.3</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index ac981b4e5a..d92fa2b04b 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.57.2</version>
+ <version>5.57.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index 888381ff62..daa5ae07d3 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.57.2</version>
+ <version>5.57.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 9c5b6ca438..8d11fa48e1 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index ad26019f61..1ab9385f4c 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.57.2</version>
+ <version>5.57.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index be65f4ff9d..13b598f09e 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index 11bde8ed90..4e5d61b864 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.57.2</version>
+ <version>5.57.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 8219c4da7f..44439f56a8 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 384487a79c..19997af8a4 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index e80a40f067..6dab1b1474 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 44973bddab..2ac6f5bc61 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.57.2</version>
+ <version>5.57.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index aff19efa8e..ed7b44e771 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.57.2</version>
+ <version>5.57.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 910fdd3ff0..bee5608d6a 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/ContributionSoftTest.php b/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/ContributionSoftTest.php
index 1438c21a0c..b635d70281 100644
--- a/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/ContributionSoftTest.php
+++ b/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/ContributionSoftTest.php
@@ -73,7 +73,9 @@ class ContributionSoftTest extends BaseTestClass {
'sct_label' => NULL,
],
];
- $list = CRM_Contribute_BAO_ContributionSoft::getSoftContributionList($this->ids['Contact']['credited']);
+ $dataTableParameters = [];
+ $list = CRM_Contribute_BAO_ContributionSoft::getSoftContributionList($this->ids['Contact']['credited'], NULL, 0, $dataTableParameters);
+ $this->assertEquals(2, $dataTableParameters['total']);
foreach ($expectedCredits[1] as $key => $value) {
$this->assertEquals($value, $list[1][$key], $key);
}
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 71dfa71c57..49dc9872cd 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.57.2</version>
+ <version>5.57.3</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 c4413da899..8ab3bf9bbd 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.57.2</version>
+ <version>5.57.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 4c8eacab9e..1357ce6c5a 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.57.2</version>
+ <version>5.57.3</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 b87137b534..92a3bbd5f8 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.57.2</version>
+ <version>5.57.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index 48cbec2b9e..8aaf3011d2 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 43c548c6bf..4518ef2287 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 629bccbc30..888b9910ad 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.57.2</version>
+ <version>5.57.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index e31ee15db4..62d7814392 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.57.2</version>
+ <version>5.57.3</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 81ef8e3d8a..86a3cf80d4 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.57.2</version>
+ <version>5.57.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 8b0302ac20..b06fe544eb 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.57.3
+
+Released January 30, 2023
+
+- **[Synopsis](release-notes/5.57.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.57.3.md#bugs)**
+- **[Credits](release-notes/5.57.3.md#credits)**
+- **[Feedback](release-notes/5.57.3.md#feedback)**
+
## CiviCRM 5.57.2
Released January 26, 2023
diff --git a/civicrm/release-notes/5.57.3.md b/civicrm/release-notes/5.57.3.md
new file mode 100644
index 0000000000..6983245cdd
--- /dev/null
+++ b/civicrm/release-notes/5.57.3.md
@@ -0,0 +1,38 @@
+# CiviCRM 5.57.3
+
+Released January 30, 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_: Soft credit listing does not show count ([dev/core#4063](https://lab.civicrm.org/dev/core/-/issues/4063): [#25460](https://github.com/civicrm/civicrm-core/pull/25460))**
+* **_CiviMail_: Resubscribing leads to crash ([dev/core#4092](https://lab.civicrm.org/dev/core/-/issues/4092): [#25467](https://github.com/civicrm/civicrm-core/pull/25467))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wildsight - Lars Sanders-Green; Wikimedia Foundation - Eileen McNaughton; JMA Consulting -
+Seamus Lee; Dave D; CiviCRM - Tim Otten; Bob Silvern
+
+## <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 4fb04a21fe..545d90e2e1 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23654,4 +23654,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.57.2';
+UPDATE civicrm_domain SET version = '5.57.3';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 12c1522690..2711d97a6e 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -3056,7 +3056,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.57.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.57.3',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 4e869e11cc..509f64a097 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb::getLoader();
+return ComposerAutoloaderInit410203b279dc82f6c58837c34a858504::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 01320839da..5d430f616a 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 ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb
+class ComposerAutoloaderInit410203b279dc82f6c58837c34a858504
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit410203b279dc82f6c58837c34a858504', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit410203b279dc82f6c58837c34a858504', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit410203b279dc82f6c58837c34a858504::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit410203b279dc82f6c58837c34a858504::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire6c9ae686e246434c72842d75d7a476bb($fileIdentifier, $file);
+ composerRequire410203b279dc82f6c58837c34a858504($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb
* @param string $file
* @return void
*/
-function composerRequire6c9ae686e246434c72842d75d7a476bb($fileIdentifier, $file)
+function composerRequire410203b279dc82f6c58837c34a858504($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 a85093da49..a8bb8680cb 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit6c9ae686e246434c72842d75d7a476bb
+class ComposerStaticInit410203b279dc82f6c58837c34a858504
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -738,11 +738,11 @@ class ComposerStaticInit6c9ae686e246434c72842d75d7a476bb
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit410203b279dc82f6c58837c34a858504::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit410203b279dc82f6c58837c34a858504::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit410203b279dc82f6c58837c34a858504::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit410203b279dc82f6c58837c34a858504::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit410203b279dc82f6c58837c34a858504::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/include_paths.php b/civicrm/vendor/composer/include_paths.php
index 06cf2843ee..189ce0e9b6 100644
--- a/civicrm/vendor/composer/include_paths.php
+++ b/civicrm/vendor/composer/include_paths.php
@@ -12,9 +12,9 @@ return array(
$vendorDir . '/pear/console_getopt',
$vendorDir . '/pear/pear-core-minimal/src',
$vendorDir . '/pear/db',
+ $vendorDir . '/pear/log',
$vendorDir . '/pear/mail',
$vendorDir . '/pear/mail_mime',
- $vendorDir . '/pear/log',
$vendorDir . '/pear/net_socket',
$vendorDir . '/pear/net_smtp',
$vendorDir . '/pear/validate_finance_creditcard',
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index e893ace168..6945361790 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' => '1addfdcbc131f23c79e1965238799af5c3bd7cbc',
+ 'reference' => 'fdf3573185d42552e69e72e803acfaab5b072997',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -61,7 +61,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '1addfdcbc131f23c79e1965238799af5c3bd7cbc',
+ 'reference' => 'fdf3573185d42552e69e72e803acfaab5b072997',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 921319e24b..89a417b33f 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.57.2</version_no>
+ <version_no>5.57.3</version_no>
</version>
--
GitLab