From ba9138c2178ec6109587c0963cd4cc0030d3263c Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Sat, 18 Sep 2021 09:01:08 -0400
Subject: [PATCH] civicrm release-5.41.1
---
civicrm.php | 4 +-
civicrm/CRM/Activity/Task.php | 2 +-
.../CRM/Contribute/Form/AdditionalInfo.php | 16 ++++++--
civicrm/CRM/Core/ClassLoader.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/greenwich/scss/_greenwich.scss | 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.1.md | 40 +++++++++++++++++++
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 +-
32 files changed, 104 insertions(+), 43 deletions(-)
create mode 100644 civicrm/release-notes/5.41.1.md
diff --git a/civicrm.php b/civicrm.php
index a880bdb648..e0911b03e7 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.41.0
+ * Version: 5.41.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.41.0');
+define('CIVICRM_PLUGIN_VERSION', '5.41.1');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Activity/Task.php b/civicrm/CRM/Activity/Task.php
index a2305a2c55..d1689bdb7f 100644
--- a/civicrm/CRM/Activity/Task.php
+++ b/civicrm/CRM/Activity/Task.php
@@ -157,7 +157,7 @@ class CRM_Activity_Task extends CRM_Core_Task {
$value = self::TASK_PRINT;
}
if (isset(self::$_tasks[$value])) {
- return [[self::$_tasks[$value]['class']], self::$_tasks[$value]['result']];
+ return [(array) self::$_tasks[$value]['class'], self::$_tasks[$value]['result']];
}
return [[], NULL];
}
diff --git a/civicrm/CRM/Contribute/Form/AdditionalInfo.php b/civicrm/CRM/Contribute/Form/AdditionalInfo.php
index 4da64147da..0cbd83f97c 100644
--- a/civicrm/CRM/Contribute/Form/AdditionalInfo.php
+++ b/civicrm/CRM/Contribute/Form/AdditionalInfo.php
@@ -190,10 +190,16 @@ class CRM_Contribute_Form_AdditionalInfo {
if (!empty($options[$selectedProductID])) {
$dao->product_option = $options[$selectedProductID][$selectedProductOptionID];
}
- if ($premiumID) {
+
+ // This IF condition codeblock does the following:
+ // 1. If premium is present then get previous contribution-product mapping record (if any) based on contribtuion ID.
+ // If found and the product chosen doesn't matches with old done, then delete or else set the ID for update
+ // 2. If no product is chosen theb delete the previous contribution-product mapping record based on contribtuion ID.
+ if ($premiumID || empty($selectedProductID)) {
$ContributionProduct = new CRM_Contribute_DAO_ContributionProduct();
- $ContributionProduct->id = $premiumID;
+ $ContributionProduct->contribution_id = $contributionID;
$ContributionProduct->find(TRUE);
+ // here $selectedProductID can be 0 in case one unselect the premium product on backoffice update form
if ($ContributionProduct->product_id == $selectedProductID) {
$dao->id = $premiumID;
}
@@ -203,7 +209,11 @@ class CRM_Contribute_Form_AdditionalInfo {
}
}
- $dao->save();
+ // only add/update contribution product when a product is selected
+ if (!empty($selectedProductID)) {
+ $dao->save();
+ }
+
//CRM-11106
if ($premiumID == NULL || $isDeleted) {
$premiumParams = [
diff --git a/civicrm/CRM/Core/ClassLoader.php b/civicrm/CRM/Core/ClassLoader.php
index 688470b9d9..a8479481d4 100644
--- a/civicrm/CRM/Core/ClassLoader.php
+++ b/civicrm/CRM/Core/ClassLoader.php
@@ -133,6 +133,8 @@ class CRM_Core_ClassLoader {
'.',
$civicrm_base_path,
$packages_path,
+ // dev/core#2812 Ensure that the database upgrade script can run if dataprocessor extension is enabled. It relies on the legacy custom searches which have been moved into this extension
+ implode(DIRECTORY_SEPARATOR, [$civicrm_base_path, 'ext', 'legacycustomsearches']),
];
$include_paths = implode(PATH_SEPARATOR, $include_paths);
set_include_path($include_paths . PATH_SEPARATOR . get_include_path());
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index bd4313cab1..197138b81a 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.41.0',
+ return array( 'version' => '5.41.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 0f0b60b915..7949c2e5a2 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.0</version>
+ <version>5.41.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 1a0f6905e8..9812101421 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.0</version>
+ <version>5.41.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 5fcc4202c6..91b35e4207 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.0</version>
+ <version>5.41.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 c410fc0b02..7a985b5c16 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.0</version>
+ <version>5.41.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index f7299fceb0..ef620c2ee6 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.0</version>
+ <version>5.41.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 56a252b7c0..1e172f03c7 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.0</version>
+ <version>5.41.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 a191578d81..9bb66e3462 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.0</version>
+ <version>5.41.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 ef528f22fb..b56eadc104 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.0</version>
+ <version>5.41.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 5a1a876e28..689d523b3f 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.0</version>
+ <version>5.41.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index ca5f65bef4..e0261f60e2 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.0</version>
+ <version>5.41.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 d651e2fbf6..073cfb3388 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.0</version>
+ <version>5.41.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 c8a32a8d2c..7f15bca35f 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.0</version>
+ <version>5.41.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/greenwich/scss/_greenwich.scss b/civicrm/ext/greenwich/scss/_greenwich.scss
index 0bf1a36276..556d64b02e 100644
--- a/civicrm/ext/greenwich/scss/_greenwich.scss
+++ b/civicrm/ext/greenwich/scss/_greenwich.scss
@@ -566,7 +566,7 @@ $popover-arrow-color: $popover-bg;
//** Popover outer arrow width
$popover-arrow-outer-width: ($popover-arrow-width + 1);
//** Popover outer arrow color
-$popover-arrow-outer-color: fadein($popover-border-color, 5%);
+$popover-arrow-outer-color: fade_in($popover-border-color, 0.05);
//** Popover outer arrow fallback color
$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%);
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 75888cf067..5b540fabbd 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.0</version>
+ <version>5.41.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 2fa5febfad..9b3af73b41 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.0</version>
+ <version>5.41.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 ee9f78a9fa..13013380b6 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.0</version>
+ <version>5.41.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 dc1ead7597..b30fe61094 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.0</version>
+ <version>5.41.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 4039c43eb0..297025b879 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.0</version>
+ <version>5.41.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 e5a0767739..a45c5c9ac5 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.0</version>
+ <version>5.41.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 48c5530749..ea5f01fce0 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.1
+
+Released September 17, 2021
+
+- **[Synopsis](release-notes/5.41.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.41.1.md#bugs)**
+- **[Credits](release-notes/5.41.1.md#credits)**
+- **[Feedback](release-notes/5.41.1.md#feedback)**
+
## CiviCRM 5.41.0
Released September 1, 2021
diff --git a/civicrm/release-notes/5.41.1.md b/civicrm/release-notes/5.41.1.md
new file mode 100644
index 0000000000..152d0fe3a9
--- /dev/null
+++ b/civicrm/release-notes/5.41.1.md
@@ -0,0 +1,40 @@
+# CiviCRM 5.41.1
+
+Released September 17, 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? | no |
+| Require attention to configuration options? | no |
+| **Fix problems installing or upgrading to a previous version?** | **yes** |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: Saving "New Contribution" with premium product fails in back-office UI ([dev/core#2816](https://lab.civicrm.org/dev/core/-/issues/2816): [#21512](https://github.com/civicrm/civicrm-core/pull/21512))**
+* **_Custom Search_: Mitigate crash when upgrading on sites with `dataprocessor` <=1.41 ([dev/core#2812](https://lab.civicrm.org/dev/core/-/issues/2812): [#21347](https://github.com/civicrm/civicrm-core/pull/21347))**
+* **_Greenwich_: Mitigate crash when upgrading on sites with `scssphp` >=1.7 ([dev/drupal#164](https://lab.civicrm.org/dev/drupal/-/issues/164): [#21502](https://github.com/civicrm/civicrm-core/pull/21502))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Megaphone Technology Consulting - Jon Goldberg;
+MJW Consulting - Matthew Wire; Joseph Lacey; JMA Consulting - Monish Deb, Seamus Lee; Dave
+D; CiviCRM - Tim Otten, Coleman Watts; Christophe Coevoet; Blackfly Solutions - Alan
+Dixon; Agileware - Justin Freeman, Francis Whittle
+
+## <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 c32ada5ed2..ab9d52246e 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.0';
+UPDATE civicrm_domain SET version = '5.41.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 0a04b8d7f3..78514fe782 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.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.41.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 99f156e193..603e665211 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit523edcf9be9a601dca1dfc943fe52a43::getLoader();
+return ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 3cd67e6b86..63a4eb9493 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 ComposerAutoloaderInit523edcf9be9a601dca1dfc943fe52a43
+class ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit523edcf9be9a601dca1dfc943fe52a43
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit523edcf9be9a601dca1dfc943fe52a43', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit523edcf9be9a601dca1dfc943fe52a43', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInita4c5858e03814fe0c8d1d3d1c8fbc18d', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit523edcf9be9a601dca1dfc943fe52a43
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit523edcf9be9a601dca1dfc943fe52a43
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire523edcf9be9a601dca1dfc943fe52a43($fileIdentifier, $file);
+ composerRequirea4c5858e03814fe0c8d1d3d1c8fbc18d($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire523edcf9be9a601dca1dfc943fe52a43($fileIdentifier, $file)
+function composerRequirea4c5858e03814fe0c8d1d3d1c8fbc18d($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 69c9c81091..224d44cd78 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43
+class ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -572,11 +572,11 @@ class ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit523edcf9be9a601dca1dfc943fe52a43::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInita4c5858e03814fe0c8d1d3d1c8fbc18d::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index de278a3faf..772d8b9ff8 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.0</version_no>
+ <version_no>5.41.1</version_no>
</version>
--
GitLab