diff --git a/civicrm.php b/civicrm.php
index a7b7be332b048b3baa12d741c5e4e47b985e490c..ef6f04f1ec8fdb6f2a69d3290c79c09951a665af 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.57.1
+ * Version: 5.57.2
* 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.1');
+define('CIVICRM_PLUGIN_VERSION', '5.57.2');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Registration.php b/civicrm/CRM/Event/Form/ManageEvent/Registration.php
index c2b186cddd4bea47cfb0b7469916523c61b176e0..babb08cc9fa97f40ae5a23d7113285322fd2ea59 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Registration.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Registration.php
@@ -116,8 +116,7 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
$defaults["custom_post_id_multiple[$key]"] = $value;
}
}
-
- $this->assign('profilePostMultiple', CRM_Utils_Array::value('custom_post', $defaults));
+ $this->assign('profilePostMultiple', $defaults['custom_post'] ?? NULL);
// CRM-17745: Make max additional participants configurable
if (empty($defaults['max_additional_participants'])) {
@@ -149,7 +148,7 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
$defaults["additional_custom_post_id_multiple[$key]"] = $value;
}
}
- $this->assign('profilePostMultipleAdd', CRM_Utils_Array::value('additional_custom_post', $defaults, []));
+ $this->assign('profilePostMultipleAdd', $defaults['additional_custom_post'] ?? []);
}
else {
// Avoid PHP notices in the template
@@ -161,10 +160,10 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
}
// provide defaults for required fields if empty (and as a 'hint' for approval message field)
- $defaults['registration_link_text'] = CRM_Utils_Array::value('registration_link_text', $defaults, ts('Register Now'));
- $defaults['confirm_title'] = CRM_Utils_Array::value('confirm_title', $defaults, ts('Confirm Your Registration Information'));
- $defaults['thankyou_title'] = CRM_Utils_Array::value('thankyou_title', $defaults, ts('Thank You for Registering'));
- $defaults['approval_req_text'] = CRM_Utils_Array::value('approval_req_text', $defaults, ts('Participation in this event requires approval. Submit your registration request here. Once approved, you will receive an email with a link to a web page where you can complete the registration process.'));
+ $defaults['registration_link_text'] = $defaults['registration_link_text'] ?? ts('Register Now');
+ $defaults['confirm_title'] = $defaults['confirm_title'] ?? ts('Confirm Your Registration Information');
+ $defaults['thankyou_title'] = $defaults['thankyou_title'] ?? ts('Thank You for Registering');
+ $defaults['approval_req_text'] = $defaults['approval_req_text'] ?? ts('Participation in this event requires approval. Submit your registration request here. Once approved, you will receive an email with a link to a web page where you can complete the registration process.');
return $defaults;
}
@@ -442,10 +441,13 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
public static function formRule($values, $files, $form) {
if (!empty($values['is_online_registration'])) {
- if (!$values['confirm_title']) {
+ if (($values['registration_link_text'] ?? '') === '') {
+ $errorMsg['registration_link_text'] = ts('Please enter Registration Link Text');
+ }
+ if (($values['confirm_title'] ?? '') === '') {
$errorMsg['confirm_title'] = ts('Please enter a Title for the registration Confirmation Page');
}
- if (!$values['thankyou_title']) {
+ if (($values['thankyou_title'] ?? '') === '') {
$errorMsg['thankyou_title'] = ts('Please enter a Title for the registration Thank-you Page');
}
if ($values['is_email_confirm']) {
diff --git a/civicrm/CRM/Event/Form/ParticipantFeeSelection.php b/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
index 6160faf18d75c3440af22a4c8b0ef0510a774eb5..18941b4911b505699b72a0ac80ebfef8e714b55b 100644
--- a/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
+++ b/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
@@ -346,7 +346,7 @@ class CRM_Event_Form_ParticipantFeeSelection extends CRM_Core_Form {
$this->_contributorDisplayName = ($this->_contributorDisplayName == ' ') ? $this->_contributorEmail : $this->_contributorDisplayName;
$waitStatus = CRM_Event_PseudoConstant::participantStatus(NULL, "class = 'Waiting'");
- $this->assign('isOnWaitlist', (bool) ($params['status_id'][$waitStatus] ?? FALSE));
+ $this->assign('isOnWaitlist', (bool) in_array($params['status_id'], $waitStatus));
$this->assign('contactID', $this->_contactId);
$sendTemplateParams = [
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveFiftySeven.php b/civicrm/CRM/Upgrade/Incremental/php/FiveFiftySeven.php
index 08f80045a013a0041c0ba868c4e8063771ef50b4..eb0464079d9e47536b112da58d30e6a639e4c6cc 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FiveFiftySeven.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FiveFiftySeven.php
@@ -21,10 +21,26 @@
*/
class CRM_Upgrade_Incremental_php_FiveFiftySeven extends CRM_Upgrade_Incremental_Base {
+ /**
+ * How many activities before the queries used here are slow. Guessing.
+ */
+ const ACTIVITY_THRESHOLD = 1000000;
+
public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
if ($rev === '5.57.alpha1') {
- if (CRM_Core_DAO::singleValueQuery('SELECT COUNT(id) FROM civicrm_activity WHERE is_current_revision = 0')) {
- $preUpgradeMessage .= '<p>' . ts('Your database contains CiviCase activity revisions which are deprecated and will begin to appear as duplicates in SearchKit/api4/etc.<ul><li>For further instructions see this <a %1>Lab Snippet</a>.</li></ul>', [1 => 'target="_blank" href="https://lab.civicrm.org/-/snippets/85"']) . '</p>';
+ $docUrl = 'https://civicrm.org/redirect/activities-5.57';
+ $docAnchor = 'target="_blank" href="' . htmlentities($docUrl) . '"';
+
+ // The query on is_current_revision is slow if there's a lot of activities. So limit when it gets run.
+ $activityCount = CRM_Core_DAO::singleValueQuery('SELECT MAX(id) FROM civicrm_activity');
+ if ($activityCount < self::ACTIVITY_THRESHOLD && CRM_Core_DAO::singleValueQuery('SELECT COUNT(id) FROM civicrm_activity WHERE is_current_revision = 0')) {
+ $preUpgradeMessage .= '<p>' . ts('Your database contains CiviCase activity revisions which are deprecated and will begin to appear as duplicates in SearchKit/api4/etc.<ul><li>For further instructions see this <a %1>Lab Snippet</a>.</li></ul>', [1 => $docAnchor]) . '</p>';
+ }
+ // Similarly the original_id ON DELETE drop+recreate is slow, so if we
+ // don't add the task farther down below, then tell people what to do at
+ // their convenience.
+ elseif ($activityCount >= self::ACTIVITY_THRESHOLD) {
+ $preUpgradeMessage .= '<p>' . ts('The activity table <strong>will not update automatically</strong> because it contains too many records. You will need to apply a <strong>manual update</strong>. Please read about <a %1>how to clean data from the defunct "Embedded Activity Revisions" setting</a>.', [1 => $docAnchor]) . '</p>';
}
}
}
@@ -37,7 +53,9 @@ class CRM_Upgrade_Incremental_php_FiveFiftySeven extends CRM_Upgrade_Incremental
*/
public function upgrade_5_57_alpha1($rev): void {
$this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
- $this->addTask('Fix dangerous delete cascade', 'fixDeleteCascade');
+ if (CRM_Core_DAO::singleValueQuery('SELECT MAX(id) FROM civicrm_activity') < self::ACTIVITY_THRESHOLD) {
+ $this->addTask('Fix dangerous delete cascade', 'fixDeleteCascade');
+ }
$this->addExtensionTask('Enable SearchKit extension', ['org.civicrm.search_kit'], 1100);
$this->addExtensionTask('Enable Flexmailer extension', ['org.civicrm.flexmailer']);
}
diff --git a/civicrm/CRM/Utils/Check/Component/Schema.php b/civicrm/CRM/Utils/Check/Component/Schema.php
index a61288d4b392a58af6f3cecf116bed4e4a7d6b84..8a4327f16ced5c005892c22fe2dfa75f159bd527 100644
--- a/civicrm/CRM/Utils/Check/Component/Schema.php
+++ b/civicrm/CRM/Utils/Check/Component/Schema.php
@@ -176,6 +176,41 @@ class CRM_Utils_Check_Component_Schema extends CRM_Utils_Check_Component {
return $messages;
}
+ /**
+ * The column 'civicrm_activity.original_id' should not have 'ON DELETE CASCADE'.
+ * It is OK to have 'ON DELETE SET NULL' or to have no constraint.
+ *
+ * @return CRM_Utils_Check_Message[]
+ */
+ public function checkOldAcitvityCascade(): array {
+ $messages = [];
+
+ $sql = "SELECT CONSTRAINT_NAME, DELETE_RULE
+ FROM information_schema.referential_constraints
+ WHERE CONSTRAINT_SCHEMA=database() AND TABLE_NAME='civicrm_activity' AND CONSTRAINT_NAME='FK_civicrm_activity_original_id'
+ ";
+ $cascades = CRM_Core_DAO::executeQuery($sql, [], FALSE, NULL, FALSE, FALSE)
+ ->fetchMap('CONSTRAINT_NAME', 'DELETE_RULE');
+ $cascade = $cascades['FK_civicrm_activity_original_id'] ?? NULL;
+ if ($cascade === 'CASCADE') {
+ $docUrl = 'https://civicrm.org/redirect/activities-5.57';
+ $messages[] = new CRM_Utils_Check_Message(
+ __FUNCTION__,
+ ts(
+ '<p>The table <code>%1</code> includes an incorrect constraint. <a %2>Learn how to fix this.</a>', [
+ 1 => 'civicrm_activity',
+ 2 => 'target="_blank" href="' . htmlentities($docUrl) . '"',
+ ]
+ ),
+ ts('Schema Error'),
+ \Psr\Log\LogLevel::WARNING,
+ 'fa-server'
+ );
+ }
+
+ return $messages;
+ }
+
/**
* @return CRM_Utils_Check_Message[]
*/
diff --git a/civicrm/ang/crmUi.js b/civicrm/ang/crmUi.js
index 6b9a54c622b41a4d61275d84917cd5bcb76587b3..309d512bdd690be8fe90fd66b167d44c24a629c6 100644
--- a/civicrm/ang/crmUi.js
+++ b/civicrm/ang/crmUi.js
@@ -753,7 +753,7 @@
if (ctrl.ngModel) {
// Ensure widget is updated when model changes
ctrl.ngModel.$render = function() {
- element.val(ctrl.ngModel.$viewValue || '').change();
+ element.val(ctrl.ngModel.$viewValue || '');
};
// Copied from ng-list
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index b353ae531d69257625a6ac83221d119e8543e627..9f4912d3300246e66073a550d267535338ffaaaf 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.57.1',
+ return array( 'version' => '5.57.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 0f8f8f423493dcb1b66c63f19ad8307b4bd2781d..0818af6b541e3c92db3a291f484bce7cc0ef03f3 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.1</version>
+ <version>5.57.2</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 434f5154b4ae1149358b7040781d805f205db880..7cea730a6ba6bd63daefb755b520cb7fd73c1791 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.1</version>
+ <version>5.57.2</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 1cb4104bf08bc78a273cba3de75cc47ac1831435..ac981b4e5ac90ab5dff4c668ed513e4a9109c798 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.1</version>
+ <version>5.57.2</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 c7172e0e00db02117fef3c463820f963b2f773ef..888381ff62714de6ed81a69df74d26b991a08a67 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.1</version>
+ <version>5.57.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index ed50b21a08b6be2efb290208aaa0534dee11fdd9..9c5b6ca438e331841d2d8e888686fb0314d26f9b 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.1</version>
+ <version>5.57.2</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 55f2a8b851ef1a3a1e9b501d34e3199d3f5f270f..ad26019f6163a0f7e3def3c4a98b6bc7ea4fdfb8 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.1</version>
+ <version>5.57.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 2c23e04151054c6786b7f0ffd9176b7bbf48c024..be65f4ff9dbafc9a67523c258dc235f0743704d2 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.1</version>
+ <version>5.57.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index db18283937af6bbd5ac8a3f3d329b3a5fc7b166d..11bde8ed9030e5d5b1d4d9d15abfd0aa74541130 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.1</version>
+ <version>5.57.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 859494e6aa79b5b369898bfa987822760c4abd14..8219c4da7fe5fa2ff8de8f1f1693dc59726275ed 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.1</version>
+ <version>5.57.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 71fd534f45a151294d31c959fcdc1f8c189eefe6..384487a79c3642de5f55db061b09023d4ace415a 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.1</version>
+ <version>5.57.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index f2261f2de8835b55f58c6da459600496865ee134..e80a40f06737613e267a5e73d83fa059e67979b0 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.1</version>
+ <version>5.57.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index a914ff700cc6652350f7a7aad3b1b1c018bcff41..44973bddab64413895c55cf7958288529339f196 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.1</version>
+ <version>5.57.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 5427e196742d91acfe1cbdcd8885e43de5ce5c9f..aff19efa8ee2550166f59c8a5a8bd1dc5ec58c7c 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.1</version>
+ <version>5.57.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index d9ec7fc3c185bb7510c1d31f80b419e4dd96ef51..910fdd3ff02e57ea28ff2b976064c39206fcd074 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.1</version>
+ <version>5.57.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index fb8dd2b138566782b5bca3e693c49a0db2af6fdf..71dfa71c574de7a063070756890b2117de54a400 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.1</version>
+ <version>5.57.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 c47a3b0d08664ce925af0f2be9b8ccf49e1f4104..c4413da899295a92cb7ef2341b5f09a6a9f5feb2 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.1</version>
+ <version>5.57.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 91561692d7e77c17b41e89016efdee8d376610b2..4c8eacab9e6c3086e5e9bd4501069ecbbcb66a26 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.1</version>
+ <version>5.57.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:hidden</tag>
diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml
index 55a6aad6b9137e6cf87c1f6306fe0ee94c6dedb5..b87137b534a8d9869451c09957db2337b0d5813c 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.1</version>
+ <version>5.57.2</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 9a720a0e873671559bff3e00f57027c3c4545894..48cbec2b9e0ddbb5eac1235e12e2c1381d06382e 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.1</version>
+ <version>5.57.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index c83829ba93b1e506b536f498d766ab4006339a69..43c548c6bf040e9010cfbefa6eaa43e5ae0ccd33 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.1</version>
+ <version>5.57.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.57</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 9b5da6213934fca411d7c55f79a284e9757b1a4d..629bccbc30451811c811953c325cfe98f590a3d3 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.1</version>
+ <version>5.57.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 5ab6e94529787900e13472390755d500fa11dac8..e31ee15db4151bf0b97938191bdc60ec6163311e 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.1</version>
+ <version>5.57.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 1c9f1dbe368612fb504609e1923ba0dc943ca842..81ef8e3d8a4fa25cb79996929634c5726477849b 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.1</version>
+ <version>5.57.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 2a2b32fd74a9017dfe465db42a0ed53f85486e1e..8b0302ac2057dc2836bf1647af4a19299fa1e820 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.2
+
+Released January 26, 2023
+
+- **[Synopsis](release-notes/5.57.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.57.2.md#bugs)**
+- **[Credits](release-notes/5.57.2.md#credits)**
+- **[Feedback](release-notes/5.57.2.md#feedback)**
+
## CiviCRM 5.57.1
Released January 12, 2023
diff --git a/civicrm/release-notes/5.57.2.md b/civicrm/release-notes/5.57.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..be06221455fe2e424a37b8e06a36a6d9ff0900d1
--- /dev/null
+++ b/civicrm/release-notes/5.57.2.md
@@ -0,0 +1,44 @@
+# CiviCRM 5.57.2
+
+Released January 26, 2023
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+| --------------------------------------------------------------- | -------- |
+| Change the database schema? | no |
+| Alter the API? | no |
+| Require attention to configuration options? | no |
+| **Fix problems installing or upgrading to a previous version?** | **yes** |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+| Fix security vulnerabilities? | no |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviEvent_: Fix confirmation email for offline registrations ([dev/core#4087](https://lab.civicrm.org/dev/core/-/issues/4087): [#25370](https://github.com/civicrm/civicrm-core/pull/25370))**
+* **_CiviEvent_: Fix missing defaults ([#25410](https://github.com/civicrm/civicrm-core/pull/25410))**
+* **_Distmaker_: Fix "WordPress" entry in JSON build-report ([#25424](https://github.com/civicrm/civicrm-core/pull/25424))**
+* **_Form Builder_: Fix autocomplete for "Existing Contact" fields ([dev/core#4083](https://lab.civicrm.org/dev/core/-/issues/4083): [#25374](https://github.com/civicrm/civicrm-core/pull/25374))**
+* **_Upgrade_: Defer expensive upgrade step (for large databases) ([#25380](https://github.com/civicrm/civicrm-core/pull/25380))**
+* **_Upgrade_: Add status-check about deferred upgrade step ([#25437](https://github.com/civicrm/civicrm-core/pull/25437))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wildsight - Lars Sanders-Green; Wikimedia Foundation - Eileen McNaughton; Megaphone
+Technology Consulting - Brienne Kordis; JMA Consulting - Seamus Lee; Dave D; CiviCRM -
+Coleman Watts, Tim Otten; Circle Interactive - Pradeep Nayak; Christian Wach; Australian
+Greens - Andrew Cormick-Dockery
+
+## <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 c29adf4623eb3a233e9ba7d7bb40a71911408e24..4fb04a21fe7824f5e7a7b4dc73d690a98eca1bd9 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.1';
+UPDATE civicrm_domain SET version = '5.57.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index e5435b1b1fbfbd37f06f130a9b92b68d4665b1c4..12c152269001a376745cd63d199439d07aaa53e9 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.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.57.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/Event/Form/ManageEvent/Registration.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index c3db65bb90d1d8a47ff62dd04af838b59e86aee0..946aaa4ebf646996b8ccdb00b8277b852d1c6242 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -50,7 +50,7 @@
<tr class="crm-event-manage-registration-form-block-registration_link_text">
<td scope="row" class="label"
- width="20%">{$form.registration_link_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='registration_link_text' id=$eventID}{/if}</td>
+ width="20%">{$form.registration_link_text.label} <span class="crm-marker">*</span>{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='registration_link_text' id=$eventID}{/if}</td>
<td>{$form.registration_link_text.html} {help id="id-link_text"}</td>
</tr>
{if !$isTemplate}
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 2c27cd7d1f82fe5b3b4d243b382f1a6439036d40..4e869e11cc71f9354328656d8ff50665cca4cf4b 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit33b931cc9909fb98223956c347efaa64::getLoader();
+return ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index bcfb5bd97b1063ad624e6f0a5dff62151052466d..01320839da13701ba31f7a3529ead7ef449ab2e7 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 ComposerAutoloaderInit33b931cc9909fb98223956c347efaa64
+class ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInit33b931cc9909fb98223956c347efaa64
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit33b931cc9909fb98223956c347efaa64', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInit33b931cc9909fb98223956c347efaa64', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit6c9ae686e246434c72842d75d7a476bb', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInit33b931cc9909fb98223956c347efaa64
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit33b931cc9909fb98223956c347efaa64::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInit33b931cc9909fb98223956c347efaa64
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit33b931cc9909fb98223956c347efaa64::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire33b931cc9909fb98223956c347efaa64($fileIdentifier, $file);
+ composerRequire6c9ae686e246434c72842d75d7a476bb($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInit33b931cc9909fb98223956c347efaa64
* @param string $file
* @return void
*/
-function composerRequire33b931cc9909fb98223956c347efaa64($fileIdentifier, $file)
+function composerRequire6c9ae686e246434c72842d75d7a476bb($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 3047378057c65b3b0ff496387cc4d3e41cafbcbb..a85093da495dc7428024497492ade27545f05b41 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit33b931cc9909fb98223956c347efaa64
+class ComposerStaticInit6c9ae686e246434c72842d75d7a476bb
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -738,11 +738,11 @@ class ComposerStaticInit33b931cc9909fb98223956c347efaa64
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit33b931cc9909fb98223956c347efaa64::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit33b931cc9909fb98223956c347efaa64::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit33b931cc9909fb98223956c347efaa64::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit33b931cc9909fb98223956c347efaa64::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit33b931cc9909fb98223956c347efaa64::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit6c9ae686e246434c72842d75d7a476bb::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/include_paths.php b/civicrm/vendor/composer/include_paths.php
index 189ce0e9b6cf55031ce76c58174cb9f3eb050687..06cf2843ee439212db0953b251eb0a3d769e64ee 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 5c942d443372279bbaca8f83fcae88337ec513ee..e893ace168975c4fa03a43bea01152dd185081ba 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' => 'c8c56978a794cbe0a83cc13199281c6423b93c0a',
+ 'reference' => '1addfdcbc131f23c79e1965238799af5c3bd7cbc',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -61,7 +61,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'c8c56978a794cbe0a83cc13199281c6423b93c0a',
+ 'reference' => '1addfdcbc131f23c79e1965238799af5c3bd7cbc',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index fb6db02f7d62636fb166af93856a988fd04f2aa9..921319e24baf7a307e6f9cf8de0479501cd6de71 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.1</version_no>
+ <version_no>5.57.2</version_no>
</version>