From 3ed4205204bccb6d17eae642cd145ab96f86e235 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Thu, 14 Oct 2021 08:14:18 -0400
Subject: [PATCH] civicrm release-5.42.1
---
civicrm.php | 4 +-
civicrm/api/v3/Membership.php | 22 +++++++---
civicrm/api/v3/Order.php | 2 +
civicrm/civicrm-version.php | 2 +-
.../Civi/AfformAdmin/AfformAdminMeta.php | 2 +-
.../Civi/Api4/Action/Afform/LoadAdminData.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/ckeditor4/info.xml | 2 +-
.../ext/contributioncancelactions/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/oauth-client/info.xml | 2 +-
civicrm/ext/payflowpro/info.xml | 2 +-
civicrm/ext/recaptcha/info.xml | 2 +-
.../SearchDisplay/AbstractRunAction.php | 1 +
civicrm/ext/search_kit/info.xml | 2 +-
civicrm/ext/sequentialcreditnotes/info.xml | 2 +-
civicrm/release-notes.md | 9 ++++
civicrm/release-notes/5.42.1.md | 43 +++++++++++++++++++
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/xml/version.xml | 2 +-
33 files changed, 111 insertions(+), 46 deletions(-)
create mode 100644 civicrm/release-notes/5.42.1.md
diff --git a/civicrm.php b/civicrm.php
index 7e1cf6f6e8..c127cb52cc 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.42.0
+ * Version: 5.42.1
* Requires at least: 4.9
* Requires PHP: 7.2
* Author: CiviCRM LLC
@@ -54,7 +54,7 @@ if (!defined('ABSPATH')) {
}
// Set version here: when it changes, will force Javascript & CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '5.42.0');
+define('CIVICRM_PLUGIN_VERSION', '5.42.1');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/api/v3/Membership.php b/civicrm/api/v3/Membership.php
index 52e64b8b74..c7a3b1d5e4 100644
--- a/civicrm/api/v3/Membership.php
+++ b/civicrm/api/v3/Membership.php
@@ -90,9 +90,19 @@ function civicrm_api3_membership_create($params) {
// Calculate membership dates
// Fixme: This code belongs in the BAO
- if (!empty($params['num_terms'])) {
+ if (empty($params['id']) || !empty($params['num_terms'])) {
// If this is a new membership or we have a specified number of terms calculate membership dates.
- if (!empty($params['id'])) {
+ if (empty($params['id'])) {
+ // This is a new membership, calculate the membership dates.
+ $calcDates = CRM_Member_BAO_MembershipType::getDatesForMembershipType(
+ $params['membership_type_id'],
+ CRM_Utils_Array::value('join_date', $params),
+ CRM_Utils_Array::value('start_date', $params),
+ CRM_Utils_Array::value('end_date', $params),
+ CRM_Utils_Array::value('num_terms', $params, 1)
+ );
+ }
+ else {
// This is an existing membership, calculate the membership dates after renewal
// num_terms is treated as a 'special sauce' for is_renewal but this
// isn't really helpful for completing pendings.
@@ -102,10 +112,10 @@ function civicrm_api3_membership_create($params) {
CRM_Utils_Array::value('membership_type_id', $params),
$params['num_terms']
);
- foreach (['join_date', 'start_date', 'end_date'] as $date) {
- if (empty($params[$date]) && isset($calcDates[$date])) {
- $params[$date] = $calcDates[$date];
- }
+ }
+ foreach (['join_date', 'start_date', 'end_date'] as $date) {
+ if (empty($params[$date]) && isset($calcDates[$date])) {
+ $params[$date] = $calcDates[$date];
}
}
}
diff --git a/civicrm/api/v3/Order.php b/civicrm/api/v3/Order.php
index 0bef6bef79..400bef6f12 100644
--- a/civicrm/api/v3/Order.php
+++ b/civicrm/api/v3/Order.php
@@ -304,6 +304,8 @@ function _civicrm_api3_order_delete_spec(array &$params) {
*/
function _order_create_wrangle_membership_params(array &$membershipParams) {
$fields = Membership::getFields(FALSE)->execute()->indexBy('name');
+ // Ensure this legacy parameter is not true.
+ $membershipParams['skipStatusCal'] = FALSE;
foreach ($fields as $fieldName => $field) {
$customFieldName = 'custom_' . ($field['custom_field_id'] ?? NULL);
if ($field['type'] === ['Custom'] && isset($membershipParams[$customFieldName])) {
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 4b1e858b56..4c8e36bb77 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.42.0',
+ return array( 'version' => '5.42.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php b/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
index b81b0251d7..93d700d624 100644
--- a/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
+++ b/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
@@ -124,7 +124,7 @@ class AfformAdminMeta {
$fields = (array) civicrm_api4($entityName, 'getFields', $params);
// Add implicit joins to search fields
- if ($params['action'] === 'search') {
+ if ($params['action'] === 'get') {
foreach (array_reverse($fields, TRUE) as $index => $field) {
if (!empty($field['fk_entity']) && !$field['options']) {
$fkLabelField = CoreUtil::getInfoItem($field['fk_entity'], 'label_field');
diff --git a/civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php b/civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
index 289206b08f..00ef13985c 100644
--- a/civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
+++ b/civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
@@ -161,7 +161,7 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
}
if ($info['definition']['type'] === 'search') {
- $getFieldsMode = 'search';
+ $getFieldsMode = 'get';
$displayTags = [];
if ($newForm) {
[$searchName, $displayName] = array_pad(explode('.', $this->entity ?? ''), 2, '');
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 3a4a09c4c1..65a80c06eb 100644
--- a/civicrm/ext/afform/admin/info.xml
+++ b/civicrm/ext/afform/admin/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.42.0</version>
+ <version>5.42.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index ddbca10dfd..26304df6de 100644
--- a/civicrm/ext/afform/core/info.xml
+++ b/civicrm/ext/afform/core/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.42.0</version>
+ <version>5.42.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 7f35d65b80..717d3f3fdc 100644
--- a/civicrm/ext/afform/html/info.xml
+++ b/civicrm/ext/afform/html/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.42.0</version>
+ <version>5.42.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index c8b775e85f..c8944777f5 100644
--- a/civicrm/ext/afform/mock/info.xml
+++ b/civicrm/ext/afform/mock/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.42.0</version>
+ <version>5.42.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index ce12fdf691..88f9cd9869 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.42.0</version>
+ <version>5.42.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index cafb74c1f7..a86695d96f 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.42.0</version>
+ <version>5.42.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.39</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 106ff1a8d6..ed653efbe1 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.42.0</version>
+ <version>5.42.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.32</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 66200d4c96..017bd49e38 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.42.0</version>
+ <version>5.42.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index f6ecf08b25..3ff8160659 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.42.0</version>
+ <version>5.42.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index b8124fe345..97bb65c559 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.42.0</version>
+ <version>5.42.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.30</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 0d10583201..9a67d26c19 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.42.0</version>
+ <version>5.42.1</version>
<develStage>stable</develStage>
<comments>
FlexMailer is an email delivery engine which replaces the internal guts
diff --git a/civicrm/ext/greenwich/info.xml b/civicrm/ext/greenwich/info.xml
index 9d66643127..d43da6e672 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.42.0</version>
+ <version>5.42.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 7b60669b2c..50de83be30 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.42.0</version>
+ <version>5.42.1</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:hidden</tag>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index b119dede07..1fbd3d4f60 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.42.0</version>
+ <version>5.42.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 1768eff73e..ea769b7c50 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.42.0</version>
+ <version>5.42.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index d15cf37f2c..cac65d4a3b 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.42.0</version>
+ <version>5.42.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
index d18254c7c1..0e025f27df 100644
--- a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
+++ b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -339,6 +339,7 @@ abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
// Select value fields for in-place editing
if (isset($column['editable']['value'])) {
$additions[] = $column['editable']['value'];
+ $additions[] = $column['editable']['id'];
}
}
// Add fields referenced via token
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 259bc8af9a..d986a1e3f4 100644
--- a/civicrm/ext/search_kit/info.xml
+++ b/civicrm/ext/search_kit/info.xml
@@ -14,7 +14,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-01-06</releaseDate>
- <version>5.42.0</version>
+ <version>5.42.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 47e6d752ca..53b6ab1cec 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.42.0</version>
+ <version>5.42.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 3b7ce9a7b7..48a46a3f3d 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.42.1
+
+Released October 13, 2021
+
+- **[Synopsis](release-notes/5.42.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.42.1.md#bugs)**
+- **[Credits](release-notes/5.42.1.md#credits)**
+- **[Feedback](release-notes/5.42.1.md#feedback)**
+
## CiviCRM 5.42.0
Released October 6, 2021
diff --git a/civicrm/release-notes/5.42.1.md b/civicrm/release-notes/5.42.1.md
new file mode 100644
index 0000000000..3f146ed3c1
--- /dev/null
+++ b/civicrm/release-notes/5.42.1.md
@@ -0,0 +1,43 @@
+# CiviCRM 5.42.1
+
+Released October 13, 2021
+
+- **[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?** | **yes** |
+| Require attention to configuration options? | no |
+| Fix problems installing or upgrading to a previous version? | no |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviMember_: Restore support for APIv3 option "skipStatusCal" ([dev/core#2902](https://lab.civicrm.org/dev/core/-/issues/2902), [dev/core#2904](https://lab.civicrm.org/dev/core/-/issues/2904): [#21784](https://github.com/civicrm/civicrm-core/pull/21784), [#21796](https://github.com/civicrm/civicrm-core/pull/21796))**
+
+ In some scenarios, new memberships may be recorded without their expected dates (`join_date`, `end_date`, etc). This affects callers using the `Membership` or `Order` API with option `skipStatusCal`.
+
+* **_Search Kit_: Fix in-place edit ([#21769](https://github.com/civicrm/civicrm-core/pull/21769), [#21533](https://github.com/civicrm/civicrm-core/pull/21533))**
+* **_Afform_: Fix loading of custom fields in search displays ([#21792](https://github.com/civicrm/civicrm-core/pull/21792))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano; Semper IT - Karin
+Gerritsen; JMA Consulting - Seamus Lee; Humanists UK - Andrew West;; Fuzion - Jitendra Purohit;
+Francesc Bassas i Bullich; Context Institute - Robert Gilman; CiviCRM - Coleman Watts, Tim Otten;
+Agileware - Francis Whittle, 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 c13880cd35..15a949658d 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23961,4 +23961,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.42.0';
+UPDATE civicrm_domain SET version = '5.42.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index a982baff27..0521d9e757 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2866,7 +2866,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.42.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.42.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 1917126a7c..933327f490 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa::getLoader();
+return ComposerAutoloaderInit3b2ff727b31236c2243afdf02557ffe5::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index cc10747caa..54dba0c20d 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 ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa
+class ComposerAutoloaderInit3b2ff727b31236c2243afdf02557ffe5
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit3b2ff727b31236c2243afdf02557ffe5', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit3b2ff727b31236c2243afdf02557ffe5', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit3b2ff727b31236c2243afdf02557ffe5::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit3b2ff727b31236c2243afdf02557ffe5::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire44feec73fa7cf97106f6eca405484cfa($fileIdentifier, $file);
+ composerRequire3b2ff727b31236c2243afdf02557ffe5($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire44feec73fa7cf97106f6eca405484cfa($fileIdentifier, $file)
+function composerRequire3b2ff727b31236c2243afdf02557ffe5($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 33048aff0d..4ca6642c2f 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit44feec73fa7cf97106f6eca405484cfa
+class ComposerStaticInit3b2ff727b31236c2243afdf02557ffe5
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -572,11 +572,11 @@ class ComposerStaticInit44feec73fa7cf97106f6eca405484cfa
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit3b2ff727b31236c2243afdf02557ffe5::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit3b2ff727b31236c2243afdf02557ffe5::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit3b2ff727b31236c2243afdf02557ffe5::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit3b2ff727b31236c2243afdf02557ffe5::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit3b2ff727b31236c2243afdf02557ffe5::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index ea759bb5b7..07c3c97e61 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.42.0</version_no>
+ <version_no>5.42.1</version_no>
</version>
--
GitLab