From 7c6621ffccd314b537f559788f362801217e98bf Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Sat, 25 Sep 2021 08:44:59 -0400
Subject: [PATCH] civicrm release-5.41.2
---
civicrm.php | 4 +-
civicrm/CRM/Contact/BAO/GroupContactCache.php | 2 +-
civicrm/Civi/Api4/File.php | 22 ++++++++++
.../Spec/Provider/ContactGetSpecProvider.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/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 +-
civicrm/ext/search_kit/info.xml | 2 +-
civicrm/ext/sequentialcreditnotes/info.xml | 2 +-
civicrm/release-notes.md | 9 ++++
civicrm/release-notes/5.41.2.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 +-
31 files changed, 114 insertions(+), 40 deletions(-)
create mode 100644 civicrm/Civi/Api4/File.php
create mode 100644 civicrm/release-notes/5.41.2.md
diff --git a/civicrm.php b/civicrm.php
index e0911b03e7..19ee433b91 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.41.1
+ * Version: 5.41.2
* 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.41.1');
+define('CIVICRM_PLUGIN_VERSION', '5.41.2');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Contact/BAO/GroupContactCache.php b/civicrm/CRM/Contact/BAO/GroupContactCache.php
index f9121049df..6b44f38f5e 100644
--- a/civicrm/CRM/Contact/BAO/GroupContactCache.php
+++ b/civicrm/CRM/Contact/BAO/GroupContactCache.php
@@ -835,7 +835,7 @@ ORDER BY gc.contact_id, g.children
if ($savedSearch['api_entity']) {
$sql = self::getApiSQL($savedSearch, $groupID);
}
- elseif (!empty($savedSearch['form_values']['customSearchID'])) {
+ elseif (!empty($savedSearch['search_custom_id'])) {
$sql = self::getCustomSearchSQL($savedSearch, $groupID);
}
else {
diff --git a/civicrm/Civi/Api4/File.php b/civicrm/Civi/Api4/File.php
new file mode 100644
index 0000000000..7d635e6588
--- /dev/null
+++ b/civicrm/Civi/Api4/File.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * File entity.
+ *
+ * @searchable none
+ * @since 5.41
+ * @package Civi\Api4
+ */
+class File extends Generic\DAOEntity {
+
+}
diff --git a/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php b/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
index 2d178bf4bd..72acc37a85 100644
--- a/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
+++ b/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
@@ -57,7 +57,7 @@ class ContactGetSpecProvider implements Generic\SpecProviderInterface {
$tempTable = \CRM_Utils_SQL_TempTable::build();
$tempTable->createWithColumns('contact_id INT');
$tableName = $tempTable->getName();
- \CRM_Contact_BAO_GroupContactCache::populateTemporaryTableWithContactsInGroups($value, $tableName);
+ \CRM_Contact_BAO_GroupContactCache::populateTemporaryTableWithContactsInGroups((array) $value, $tableName);
// SQL optimization - use INNER JOIN if the base table is Contact & this clause is not nested
if ($fieldAlias === '`a`.`id`' && $operator === "IN" && !$depth) {
$query->getQuery()->join($tableName, "INNER JOIN `$tableName` ON $fieldAlias = `$tableName`.contact_id");
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 197138b81a..47e652ac31 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.41.1',
+ return array( 'version' => '5.41.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 7949c2e5a2..60c2e9c09c 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.41.1</version>
+ <version>5.41.2</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 9812101421..20a89a9659 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.41.1</version>
+ <version>5.41.2</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 91b35e4207..0810c908b2 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.41.1</version>
+ <version>5.41.2</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 7a985b5c16..e2b5d95217 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.41.1</version>
+ <version>5.41.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index ef620c2ee6..c59ff9b5f6 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.41.1</version>
+ <version>5.41.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 1e172f03c7..f5de93be12 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.41.1</version>
+ <version>5.41.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.39</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 9bb66e3462..cb6f71c2ee 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.41.1</version>
+ <version>5.41.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.32</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index b56eadc104..6b5a387123 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.41.1</version>
+ <version>5.41.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 689d523b3f..13db33cdb6 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.41.1</version>
+ <version>5.41.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index e0261f60e2..dd3ea29ba3 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.41.1</version>
+ <version>5.41.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.30</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 073cfb3388..960110c1f1 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.41.1</version>
+ <version>5.41.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 7f15bca35f..e4cfbc8da1 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.41.1</version>
+ <version>5.41.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 5b540fabbd..b0cc4abf0d 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.41.1</version>
+ <version>5.41.2</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 9b3af73b41..9c52050c6a 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.41.1</version>
+ <version>5.41.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 13013380b6..f88fd1df97 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.41.1</version>
+ <version>5.41.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index b30fe61094..7b540afaed 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.41.1</version>
+ <version>5.41.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 297025b879..5884de56d5 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.41.1</version>
+ <version>5.41.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index a45c5c9ac5..22fa606a1b 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.41.1</version>
+ <version>5.41.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index ea5f01fce0..63bda47749 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.41.2
+
+Released September 25, 2021
+
+- **[Synopsis](release-notes/5.41.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.41.2.md#bugs)**
+- **[Credits](release-notes/5.41.2.md#credits)**
+- **[Feedback](release-notes/5.41.2.md#feedback)**
+
## CiviCRM 5.41.1
Released September 17, 2021
diff --git a/civicrm/release-notes/5.41.2.md b/civicrm/release-notes/5.41.2.md
new file mode 100644
index 0000000000..b902b22c36
--- /dev/null
+++ b/civicrm/release-notes/5.41.2.md
@@ -0,0 +1,43 @@
+# CiviCRM 5.41.2
+
+Released September 25, 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
+
+* **_Smart Groups_: Smart groups based on custom-searches are miscomputed. ([dev/core#2861](https://lab.civicrm.org/dev/core/-/issues/2861): [#21601](https://github.com/civicrm/civicrm-core/pull/21601))**
+
+ The smart group may be signficantly over-sized, including contacts who should not be members.
+
+* **_APIv4_: Backport "File" API ([#21158](https://github.com/civicrm/civicrm-core/pull/21158))**
+
+ This fixes a bug in which "Search Kit" displays crash if the target field references a file.
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Third Sector Design - Kurund Jalmi; Megaphone
+Technology Consulting - Jon Goldberg; JMA Consulting - Seamus Lee; CiviCRM - Tim Otten,
+Coleman Watts
+
+## <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 ab9d52246e..363aa72871 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23954,4 +23954,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.41.1';
+UPDATE civicrm_domain SET version = '5.41.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 78514fe782..4e5a1c42ee 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.41.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.41.2',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 603e665211..217f9b02ed 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d::getLoader();
+return ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 63a4eb9493..eb1ebb3392 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 ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d
+class ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequirea4c5858e03814fe0c8d1d3d1c8fbc18d($fileIdentifier, $file);
+ composerRequire36163a5870b8f0be1632b26ad3943b34($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequirea4c5858e03814fe0c8d1d3d1c8fbc18d($fileIdentifier, $file)
+function composerRequire36163a5870b8f0be1632b26ad3943b34($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 224d44cd78..3636e0e698 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d
+class ComposerStaticInit36163a5870b8f0be1632b26ad3943b34
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -572,11 +572,11 @@ class ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 772d8b9ff8..8d8fc668f4 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.41.1</version_no>
+ <version_no>5.41.2</version_no>
</version>
--
GitLab