diff --git a/civicrm.php b/civicrm.php index 75a8ca847a8a212bb26ba53e7151823a2a74b70c..4b8ec0b48617d1571e0c06aab1f6b537c6cce04d 100644 --- a/civicrm.php +++ b/civicrm.php @@ -2,7 +2,7 @@ /** * Plugin Name: CiviCRM * Description: CiviCRM - Growing and Sustaining Relationships - * Version: 5.46.1 + * Version: 5.46.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.46.1'); +define('CIVICRM_PLUGIN_VERSION', '5.46.2'); // Store reference to this file. if (!defined('CIVICRM_PLUGIN_FILE')) { diff --git a/civicrm/CRM/Export/BAO/ExportProcessor.php b/civicrm/CRM/Export/BAO/ExportProcessor.php index 4e85f9758c6aba9f0b2d59fe4b31e69dc75ce56b..18a5663ff8d6180c75840ad2a1dcb7b22a1d20b7 100644 --- a/civicrm/CRM/Export/BAO/ExportProcessor.php +++ b/civicrm/CRM/Export/BAO/ExportProcessor.php @@ -1464,6 +1464,16 @@ class CRM_Export_BAO_ExportProcessor { case CRM_Utils_Type::T_STRING: if (isset($fieldSpec['maxlength'])) { + // A localized string for the preferred_mail_format does not fit + // into the varchar(8) field. + // @see https://lab.civicrm.org/dev/core/-/issues/2645 + switch ($fieldName) { + case 'preferred_mail_format': + return "`$fieldName` text(16)"; + + default: + return "`$fieldName` varchar({$fieldSpec['maxlength']})"; + } } $dataType = $fieldSpec['data_type'] ?? ''; // set the sql columns for custom data diff --git a/civicrm/api/v3/Contact.php b/civicrm/api/v3/Contact.php index 2b82060958b8c59388ff868467e6e7cde473aa10..237d170cfac78e54757e87f9513c32256af94e98 100644 --- a/civicrm/api/v3/Contact.php +++ b/civicrm/api/v3/Contact.php @@ -1602,10 +1602,16 @@ function _civicrm_api3_contact_getlist_output($result, $request) { * @throws \CiviCRM_API3_Exception */ function civicrm_api3_contact_duplicatecheck($params) { + if (!isset($params['match']) || !is_array($params['match'])) { + throw new \CiviCRM_API3_Exception('Duplicate check must include criteria to check against (missing or invalid $params[\'match\']).'); + } + if (!isset($params['match']['contact_type']) || !is_string($params['match']['contact_type'])) { + throw new \CiviCRM_API3_Exception('Duplicate check must include a contact type. (missing or invalid $params[\'match\'][\'contact_type\'])'); + } $dupes = CRM_Contact_BAO_Contact::getDuplicateContacts( $params['match'], $params['match']['contact_type'], - $params['rule_type'], + $params['rule_type'] ?? '', CRM_Utils_Array::value('exclude', $params, []), CRM_Utils_Array::value('check_permissions', $params), CRM_Utils_Array::value('dedupe_rule_id', $params) diff --git a/civicrm/api/v3/utils.php b/civicrm/api/v3/utils.php index 19a3040c99f8a0673c61462f21adc8d34ca733c7..53e652bed738b55388134382bcede24fe123c9de 100644 --- a/civicrm/api/v3/utils.php +++ b/civicrm/api/v3/utils.php @@ -2085,10 +2085,10 @@ function _civicrm_api3_validate_integer(&$params, $fieldName, &$fieldInfo, $enti } } if ( - (!empty($fieldInfo['pseudoconstant']) || !empty($fieldInfo['options']) || $fieldName === 'campaign_id') - // if it is already numeric AND it is an FK field we don't need to validate because - // sql will do that for us on insert (this also saves a big lookup) - && (!is_numeric($fieldValue) || empty($fieldInfo['FKClassName'])) + (!empty($fieldInfo['pseudoconstant']) || !empty($fieldInfo['options']) || $fieldName === 'campaign_id') + // if it is already numeric AND it is an FK field we don't need to validate because + // sql will do that for us on insert (this also saves a big lookup) + && (!is_numeric($fieldValue) || !in_array($fieldName, ['campaign_id', 'payment_processor_id'])) ) { $additional_lookup_params = []; if (strtolower($entity) === 'address' && $fieldName == 'state_province_id') { diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php index a91afcde987ae20b81a60eda4f27711ce2273011..843c9c0e014bed423bd62762d20f8f48415a0f40 100644 --- a/civicrm/civicrm-version.php +++ b/civicrm/civicrm-version.php @@ -1,7 +1,7 @@ <?php /** @deprecated */ function civicrmVersion( ) { - return array( 'version' => '5.46.1', + return array( 'version' => '5.46.2', 'cms' => 'Wordpress', 'revision' => '' ); } diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml index 3b80897a05c0aed44500991cb88cdbf27b4a9e70..e26b1b70999e55592fadeae3978fccb3156e411d 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.46.1</version> + <version>5.46.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 e7e81c35995e5e81124e55d82e03d9d2e622b221..38a61a876c3fe9dab0b8fad63e0cbf99b921b583 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.46.1</version> + <version>5.46.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 36939a757be39ddd2a06c0376d9df0a8ee8bd02e..1e8048b1b0f8b342644d601bf1af908876abf637 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.46.1</version> + <version>5.46.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 f70b75501f2838841c62ed2b6bfe61742b8a8546..6e7fa8ae6475ec70b3f296e41879d3ffc0cedd38 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.46.1</version> + <version>5.46.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml index 656e449aba7d780b62f149caec0d4493eae66751..5b19d6ddce560c4d0274b4d8337532b90dbb9b3e 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.46.1</version> + <version>5.46.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 1e8cb9fc3a42660ab5004c9ad89dd07a73999be3..d5dc7187c3aec9c87c524f7cfdfb2e2bb55b4be4 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.46.1</version> + <version>5.46.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 f5cf718a1a7646cd4becb496d17d88c15be7f391..ce54ecb56abdc55d3a7012ddbfed5e2968d581bd 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.46.1</version> + <version>5.46.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 1f541edf00dea68af6c67e7443db4da5fa58d60e..f5f14259c1b6906f82112f1b4231133f19098c98 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.46.1</version> + <version>5.46.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml index 733c8567701f2d2f973929cf62cf8be373b666ef..802e95224922387a9215cebd3f4f6d7f6025e238 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.46.1</version> + <version>5.46.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml index 7cdbe756bfadff2460ef7b6707ce2f0674902845..38efcb3475409ffebefb078bb55cb12f2af98c53 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.46.1</version> + <version>5.46.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 b876d57a1cc3e3c7ea57dfb5cba4588e06548602..a43a83c10d591825d32485ffee4b1794a5616957 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.46.1</version> + <version>5.46.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 39ef903a1898ae7cf5c139a2b78bdfd7442d0c57..eeb7a02714ccc2b79e0491ce874cf2747813c6ec 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.46.1</version> + <version>5.46.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml index a09f9347d35095bf6b133da001b1bdafdd95089b..faad08e98ae97e0218e7d827a7458bbac226b568 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.46.1</version> + <version>5.46.2</version> <develStage>stable</develStage> <tags> <tag>mgmt:hidden</tag> diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml index 876eaa9d2fff41a7418e001844eaa8cc89b41298..205ac768d2f407951ef9f1b9288007f59975ef90 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.46.1</version> + <version>5.46.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml index 33e143ca51f3b9dbf655d71e17b17fe2fb9f6ac0..962d7d44ff3d89a2649b4cbc98c8e78419fc79cc 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.46.1</version> + <version>5.46.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 a9f31fbce5d931cf91f3e2ce5a2f33b6a4f6d677..cda6ccc31bbb51df670440b31ae35100b855ef61 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.46.1</version> + <version>5.46.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 f378cf229f324b22c69c15c14b00aa243f5446e7..9a4d5e2c8df0345bbb1f7931eceb3f59ce8b0101 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.46.1</version> + <version>5.46.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 39652cc8d38daa3f68b893faf862cdeac1dbfa1c..2b2a4784c6cb41c2f6d74f8392203e5786111263 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.46.1</version> + <version>5.46.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 37ed97e3c61b8bb9bbf4fc66a48979389c0fbbf8..d744c55b35249be9c95893bf65613ac89beafe87 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.46.1</version> + <version>5.46.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md index d93db4bdea6ec457eb060904eec938f6a12a236f..399de5e15f192214a0b82b41971b4aa72dd20750 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.46.2 + +Released February 10, 2022 + +- **[Synopsis](release-notes/5.46.2.md#synopsis)** +- **[Bugs resolved](release-notes/5.46.2.md#bugs)** +- **[Credits](release-notes/5.46.2.md#credits)** +- **[Feedback](release-notes/5.46.2.md#feedback)** + ## CiviCRM 5.46.1 Released February 9, 2022 diff --git a/civicrm/release-notes/5.46.2.md b/civicrm/release-notes/5.46.2.md new file mode 100644 index 0000000000000000000000000000000000000000..f9cf1ac4d6463b06bc79f8a30b7bd7165f138470 --- /dev/null +++ b/civicrm/release-notes/5.46.2.md @@ -0,0 +1,43 @@ +# CiviCRM 5.46.2 + +Released February 10, 2022 + +- **[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 + +* **_APIv3_: `Duplicatecheck` has hard failure when `rule_type` is omitted ([dev/core#3065](https://lab.civicrm.org/dev/core/-/issues/3065): [#22741](https://github.com/civicrm/civicrm-core/pull/22741))** + + This change restores compatibility with certain webform_civicrm configurations. + +* **_APIv3_: Relations with numerical names no longer resolved ([dev/core#3063](https://lab.civicrm.org/dev/core/-/issues/3063): [#22751](https://github.com/civicrm/civicrm-core/pull/22751))** + + This change restores compatibility with certain REST API consumers. + +## <a name="credits"></a>Credits + +This release was developed by the following authors and reviewers: + +Wikimedia Foundation - Eileen McNaughton; Semper IT - Karin Gerritsen; Mikey O'Toole; +Megaphone Technology Consulting - Jon Goldberg; JMA Consulting - Seamus Lee; CiviCRM - +Coleman Watts, 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 a63985b2c8fb7e6f513881c230f4e0acbc5da7ec..e237396975cfc099c922887f261eb856f68d7871 100644 --- a/civicrm/sql/civicrm_data.mysql +++ b/civicrm/sql/civicrm_data.mysql @@ -23859,4 +23859,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.46.1'; +UPDATE civicrm_domain SET version = '5.46.2'; diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql index 2537857922868f9bc5e0ca4d15a14916cb2ef6d0..df388294f576bf66b05f7c1c3517492eb0180614 100644 --- a/civicrm/sql/civicrm_generated.mysql +++ b/civicrm/sql/civicrm_generated.mysql @@ -2936,7 +2936,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.46.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.46.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 37016d4fe82c06d663cba54a0d45351f656910d3..23916208e2fd3d1f5abf81518c41954d2f9f4adc 100644 --- a/civicrm/vendor/autoload.php +++ b/civicrm/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitc0e113505b21a68b3a18184f580e459e::getLoader(); +return ComposerAutoloaderInit7d109fbe539c9854c6b4b47395293a82::getLoader(); diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php index 4c01b90de143a971d3e6e0f169f24868c21c5a65..fbcea183541e506f1033264686226b6d8814096b 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 ComposerAutoloaderInitc0e113505b21a68b3a18184f580e459e +class ComposerAutoloaderInit7d109fbe539c9854c6b4b47395293a82 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInitc0e113505b21a68b3a18184f580e459e return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitc0e113505b21a68b3a18184f580e459e', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit7d109fbe539c9854c6b4b47395293a82', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitc0e113505b21a68b3a18184f580e459e', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit7d109fbe539c9854c6b4b47395293a82', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; $includePaths[] = get_include_path(); @@ -31,7 +31,7 @@ class ComposerAutoloaderInitc0e113505b21a68b3a18184f580e459e if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitc0e113505b21a68b3a18184f580e459e::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit7d109fbe539c9854c6b4b47395293a82::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -52,19 +52,19 @@ class ComposerAutoloaderInitc0e113505b21a68b3a18184f580e459e $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitc0e113505b21a68b3a18184f580e459e::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit7d109fbe539c9854c6b4b47395293a82::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirec0e113505b21a68b3a18184f580e459e($fileIdentifier, $file); + composerRequire7d109fbe539c9854c6b4b47395293a82($fileIdentifier, $file); } return $loader; } } -function composerRequirec0e113505b21a68b3a18184f580e459e($fileIdentifier, $file) +function composerRequire7d109fbe539c9854c6b4b47395293a82($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 264e0cda97bce7e2f427f094c87ff9e08ba64719..af6f0fad29a7a07cb380383288538bc73426f4d6 100644 --- a/civicrm/vendor/composer/autoload_static.php +++ b/civicrm/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitc0e113505b21a68b3a18184f580e459e +class ComposerStaticInit7d109fbe539c9854c6b4b47395293a82 { public static $files = array ( '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', @@ -672,11 +672,11 @@ class ComposerStaticInitc0e113505b21a68b3a18184f580e459e public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitc0e113505b21a68b3a18184f580e459e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitc0e113505b21a68b3a18184f580e459e::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInitc0e113505b21a68b3a18184f580e459e::$prefixesPsr0; - $loader->fallbackDirsPsr0 = ComposerStaticInitc0e113505b21a68b3a18184f580e459e::$fallbackDirsPsr0; - $loader->classMap = ComposerStaticInitc0e113505b21a68b3a18184f580e459e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit7d109fbe539c9854c6b4b47395293a82::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit7d109fbe539c9854c6b4b47395293a82::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInit7d109fbe539c9854c6b4b47395293a82::$prefixesPsr0; + $loader->fallbackDirsPsr0 = ComposerStaticInit7d109fbe539c9854c6b4b47395293a82::$fallbackDirsPsr0; + $loader->classMap = ComposerStaticInit7d109fbe539c9854c6b4b47395293a82::$classMap; }, null, ClassLoader::class); } diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml index fcf71c2ddd914436be0a7051f7e7c009e0a8d991..79a060a04febdd1a510f62b9211f543e22b2f259 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.46.1</version_no> + <version_no>5.46.2</version_no> </version>