From 4b6d93d4f778bca7cbf281b7284c1e1f34ff4108 Mon Sep 17 00:00:00 2001 From: Kevin Cristiano <kcristiano@kcristiano.com> Date: Sat, 6 May 2023 07:48:40 -0400 Subject: [PATCH] civicrm release-5.61.1 --- civicrm.php | 4 +- .../Upgrade/Incremental/php/FiveSixtyOne.php | 14 +++++++ civicrm/civicrm-version.php | 2 +- civicrm/ext/afform/admin/info.xml | 2 +- civicrm/ext/afform/core/info.xml | 2 +- civicrm/ext/afform/html/info.xml | 2 +- civicrm/ext/afform/mock/info.xml | 2 +- civicrm/ext/authx/info.xml | 2 +- civicrm/ext/civicrm_admin_ui/info.xml | 2 +- civicrm/ext/civigrant/info.xml | 2 +- civicrm/ext/civiimport/info.xml | 2 +- civicrm/ext/ckeditor4/info.xml | 2 +- .../ext/contributioncancelactions/info.xml | 2 +- civicrm/ext/elavon/info.xml | 2 +- civicrm/ext/eventcart/info.xml | 2 +- civicrm/ext/ewaysingle/info.xml | 2 +- civicrm/ext/financialacls/info.xml | 2 +- civicrm/ext/flexmailer/info.xml | 2 +- civicrm/ext/greenwich/info.xml | 2 +- civicrm/ext/legacycustomsearches/info.xml | 2 +- civicrm/ext/message_admin/info.xml | 2 +- civicrm/ext/oauth-client/info.xml | 2 +- civicrm/ext/payflowpro/info.xml | 2 +- civicrm/ext/recaptcha/info.xml | 2 +- civicrm/ext/search_kit/info.xml | 2 +- civicrm/ext/sequentialcreditnotes/info.xml | 2 +- civicrm/release-notes.md | 9 +++++ civicrm/release-notes/5.61.1.md | 39 +++++++++++++++++++ civicrm/sql/civicrm_data.mysql | 2 +- civicrm/sql/civicrm_generated.mysql | 2 +- civicrm/vendor/autoload.php | 2 +- civicrm/vendor/composer/autoload_real.php | 14 +++---- civicrm/vendor/composer/autoload_static.php | 12 +++--- civicrm/vendor/composer/installed.php | 4 +- civicrm/xml/version.xml | 2 +- 35 files changed, 107 insertions(+), 45 deletions(-) create mode 100644 civicrm/release-notes/5.61.1.md diff --git a/civicrm.php b/civicrm.php index f9f170e6bf..51c3709b4f 100644 --- a/civicrm.php +++ b/civicrm.php @@ -2,7 +2,7 @@ /** * Plugin Name: CiviCRM * Description: CiviCRM - Growing and Sustaining Relationships - * Version: 5.61.0 + * Version: 5.61.1 * Requires at least: 4.9 * Requires PHP: 7.3 * 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.61.0'); +define('CIVICRM_PLUGIN_VERSION', '5.61.1'); // Store reference to this file. if (!defined('CIVICRM_PLUGIN_FILE')) { diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyOne.php b/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyOne.php index c9e59195a3..75534f010b 100644 --- a/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyOne.php +++ b/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyOne.php @@ -41,6 +41,14 @@ class CRM_Upgrade_Incremental_php_FiveSixtyOne extends CRM_Upgrade_Incremental_B } } + public function setPostUpgradeMessage(&$postUpgradeMessage, $rev): void { + if ($rev === '5.61.1') { + if (defined('CIVICRM_UF') && CIVICRM_UF === 'Drupal8') { + $postUpgradeMessage .= '<p>' . ts('You must do a one-time clear of Drupal caches now before visiting CiviCRM pages to rebuild the menu routes to avoid fatal errors. <a %1>Read more</a>.', [1 => 'href="https://civicrm.org/redirect/drupal-5.61" target="_blank"']) . '</p>'; + } + } + } + /** * Upgrade step; adds tasks including 'runSql'. * @@ -71,6 +79,12 @@ class CRM_Upgrade_Incremental_php_FiveSixtyOne extends CRM_Upgrade_Incremental_B $this->addTask(ts('Create index %1', [1 => 'civicrm_campaign.UI_name']), 'addIndex', 'civicrm_campaign', 'name', 'UI'); } + /** + * Needs to exist for postUpgradeMessage to get called. + */ + public function upgrade_5_61_1($rev): void { + } + /** * Remove extraneous/duplicate records from `civicrm_cache`. * diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php index d0afe712ed..a78c77b0c6 100644 --- a/civicrm/civicrm-version.php +++ b/civicrm/civicrm-version.php @@ -1,7 +1,7 @@ <?php /** @deprecated */ function civicrmVersion( ) { - return array( 'version' => '5.61.0', + return array( 'version' => '5.61.1', 'cms' => 'Wordpress', 'revision' => '' ); } diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml index cbe28d4509..9ae2819be2 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.61.0</version> + <version>5.61.1</version> <develStage>beta</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml index f30e0540a6..642be7a92d 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.61.0</version> + <version>5.61.1</version> <develStage>beta</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml index 36b5cb20a9..61500df524 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.61.0</version> + <version>5.61.1</version> <develStage>alpha</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml index ef87c8a0c2..f1c9782a1e 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.61.0</version> + <version>5.61.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml index 329aa72dea..2049b49091 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml index 7d8047cb88..d3b77c5eb0 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.61.0</version> + <version>5.61.1</version> <develStage>alpha</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml index 113435815d..15076dbb17 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml index 4d6822e4c8..ba688a0ada 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.61.0</version> + <version>5.61.1</version> <develStage>alpha</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml index 988a73b83a..ef39808484 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml index f06a8c1616..e71c1d7e56 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml index 1d9ea976e1..53c9fe47da 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml index e6c8b7e4e4..55e6aafa1d 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.61.0</version> + <version>5.61.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml index dd73ec4ce4..bea226e36d 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.61.0</version> + <version>5.61.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml index afd5615027..3c1f9bd3b5 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml index 4bb4a37fad..45c348cffc 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.61.0</version> + <version>5.61.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 b4799076f9..70b3b921b3 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.61.0</version> + <version>5.61.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml index a712668b72..0fd729e854 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.61.0</version> + <version>5.61.1</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 6f08123c57..39bb0f660d 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.61.0</version> + <version>5.61.1</version> <develStage>alpha</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml index d585a069d1..db888a9e7a 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml index e456d677ff..6ada15c9b0 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <compatibility> <ver>5.61</ver> diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml index 001975db9f..890ca4a231 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.61.0</version> + <version>5.61.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 e426722fc9..4094ee3474 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.61.0</version> + <version>5.61.1</version> <develStage>stable</develStage> <tags> <tag>mgmt:required</tag> diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml index fe2de17f85..a4c729a236 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.61.0</version> + <version>5.61.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md index 1f57de19a3..7a91c862a8 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.61.1 + +Released May 5, 2023 + +- **[Synopsis](release-notes/5.61.1.md#synopsis)** +- **[Bugs resolved](release-notes/5.61.1.md#bugs)** +- **[Credits](release-notes/5.61.1.md#credits)** +- **[Feedback](release-notes/5.61.1.md#feedback)** + ## CiviCRM 5.61.0 Released May 3, 2023 diff --git a/civicrm/release-notes/5.61.1.md b/civicrm/release-notes/5.61.1.md new file mode 100644 index 0000000000..18216c4225 --- /dev/null +++ b/civicrm/release-notes/5.61.1.md @@ -0,0 +1,39 @@ +# CiviCRM 5.61.1 + +Released May 5, 2023 + +- **[Synopsis](#synopsis)** +- **[Bugs resolved](#bugs)** +- **[Credits](#credits)** +- **[Feedback](#feedback)** + +## <a name="synopsis"></a>Synopsis + +| *Does this version...?* | | +| --------------------------------------------------------------- | -------- | +| Change the database schema? | no | +| Alter the API? | no | +| Require attention to configuration options? | no | +| Fix problems installing or upgrading to a previous version? | no | +| Introduce features? | no | +| **Fix bugs?** | **yes** | +| Fix security vulnerabilities? | no | + +## <a name="bugs"></a>Bugs resolved + +* **_Drupal_: Fix compatibility with Drupal v9.5.9 ([drupal#82](https://github.com/civicrm/civicrm-drupal-8/pull/82), [#26159](https://github.com/civicrm/civicrm-core/pull/26159))** + + Drupal v9.5.9 modified the handling of "Route" data. This revision changes the CiviCRM-Drupal routes for compatibility. Administrators should manually clear Drupal caches (`drush cc` or "_Administration > Configuration > Development_"). + +## <a name="credits"></a>Credits + +This release was developed by the following authors and reviewers: + +Skvare - Mark Hanna; marvs5; JMA Consulting - Seamus Lee; Jens Schuppe; Dave D; CiviCRM - +Tim Otten + +## <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 cfe0e295ab..a9fa10da98 100644 --- a/civicrm/sql/civicrm_data.mysql +++ b/civicrm/sql/civicrm_data.mysql @@ -23678,4 +23678,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.61.0'; +UPDATE civicrm_domain SET version = '5.61.1'; diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql index 6ffa5df847..f15128d1f4 100644 --- a/civicrm/sql/civicrm_generated.mysql +++ b/civicrm/sql/civicrm_generated.mysql @@ -3059,7 +3059,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.61.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.61.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 61e8530491..c0310fbb65 100644 --- a/civicrm/vendor/autoload.php +++ b/civicrm/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit843a42f34f0c82b46624e550e0363f9f::getLoader(); +return ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5::getLoader(); diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php index 5e9fdcbd80..c1dc5d647a 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 ComposerAutoloaderInit843a42f34f0c82b46624e550e0363f9f +class ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5 { private static $loader; @@ -24,9 +24,9 @@ class ComposerAutoloaderInit843a42f34f0c82b46624e550e0363f9f require __DIR__ . '/platform_check.php'; - spl_autoload_register(array('ComposerAutoloaderInit843a42f34f0c82b46624e550e0363f9f', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit843a42f34f0c82b46624e550e0363f9f', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; $includePaths[] = get_include_path(); @@ -36,7 +36,7 @@ class ComposerAutoloaderInit843a42f34f0c82b46624e550e0363f9f if ($useStaticLoader) { require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit843a42f34f0c82b46624e550e0363f9f::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb2e964434007560ae238a86ef426dac5::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -57,12 +57,12 @@ class ComposerAutoloaderInit843a42f34f0c82b46624e550e0363f9f $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit843a42f34f0c82b46624e550e0363f9f::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitb2e964434007560ae238a86ef426dac5::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire843a42f34f0c82b46624e550e0363f9f($fileIdentifier, $file); + composerRequireb2e964434007560ae238a86ef426dac5($fileIdentifier, $file); } return $loader; @@ -74,7 +74,7 @@ class ComposerAutoloaderInit843a42f34f0c82b46624e550e0363f9f * @param string $file * @return void */ -function composerRequire843a42f34f0c82b46624e550e0363f9f($fileIdentifier, $file) +function composerRequireb2e964434007560ae238a86ef426dac5($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 7650ee8d7e..376b53fe6b 100644 --- a/civicrm/vendor/composer/autoload_static.php +++ b/civicrm/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit843a42f34f0c82b46624e550e0363f9f +class ComposerStaticInitb2e964434007560ae238a86ef426dac5 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -729,11 +729,11 @@ class ComposerStaticInit843a42f34f0c82b46624e550e0363f9f public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit843a42f34f0c82b46624e550e0363f9f::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit843a42f34f0c82b46624e550e0363f9f::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit843a42f34f0c82b46624e550e0363f9f::$prefixesPsr0; - $loader->fallbackDirsPsr0 = ComposerStaticInit843a42f34f0c82b46624e550e0363f9f::$fallbackDirsPsr0; - $loader->classMap = ComposerStaticInit843a42f34f0c82b46624e550e0363f9f::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$prefixesPsr0; + $loader->fallbackDirsPsr0 = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$fallbackDirsPsr0; + $loader->classMap = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$classMap; }, null, ClassLoader::class); } diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php index 58c04a3cca..2ed1634d24 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' => 'c01b75ee4ee5b39e63c19075fb3ced0cf1980b57', + 'reference' => '8fd20b11d8a67e4c71ce5c6828fc358b00e87c94', 'name' => 'civicrm/civicrm-core', 'dev' => true, ), @@ -43,7 +43,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'c01b75ee4ee5b39e63c19075fb3ced0cf1980b57', + 'reference' => '8fd20b11d8a67e4c71ce5c6828fc358b00e87c94', 'dev_requirement' => false, ), 'civicrm/civicrm-cxn-rpc' => array( diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml index 710e6e6ed4..649a4c66f9 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.61.0</version_no> + <version_no>5.61.1</version_no> </version> -- GitLab