diff --git a/civicrm.php b/civicrm.php
index 07297bb1ba8330701de3e046fab89900783825c3..9a11fbfab12d451cc0ed7a519ebd12b30676d6ca 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.26.1
+Version: 5.26.2
Author: CiviCRM LLC
Author URI: https://civicrm.org/
Plugin URI: https://docs.civicrm.org/sysadmin/en/latest/install/wordpress/
@@ -54,7 +54,7 @@ if ( ! defined( 'ABSPATH' ) ) exit;
// Set version here: when it changes, will force JS to reload
-define( 'CIVICRM_PLUGIN_VERSION', '5.26.1' );
+define( 'CIVICRM_PLUGIN_VERSION', '5.26.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 bd5e4a30fa3019ae7c2bdba99e601bd88d9d3c20..8b9487b858c890dbf128e2d47e11224b3e954665 100644
--- a/civicrm/CRM/Contact/BAO/GroupContactCache.php
+++ b/civicrm/CRM/Contact/BAO/GroupContactCache.php
@@ -489,7 +489,9 @@ WHERE id IN ( $groupIDs )
$tempTable = $groupContactsTempTable->getName();
$groupContactsTempTable->createWithColumns('contact_id int, group_id int, UNIQUE UI_contact_group (contact_id,group_id)');
- $contactQueries[] = $sql;
+ if (!empty($sql)) {
+ $contactQueries[] = $sql;
+ }
// lets also store the records that are explicitly added to the group
// this allows us to skip the group contact LEFT JOIN
$contactQueries[] =
diff --git a/civicrm/CRM/Contribute/Form/AbstractEditPayment.php b/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
index 27e19392c2d9d6895418cf72472f01b6ef3611dd..57e1e5a84555fd7b8d87e77d5280acdf889c55a1 100644
--- a/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
+++ b/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
@@ -661,14 +661,15 @@ WHERE contribution_id = {$id}
/**
* Get the default payment instrument id.
*
+ * This priortises the submitted value, if any and falls back on the processor.
+ *
* @return int
+ *
+ * @throws \CRM_Core_Exception
*/
protected function getDefaultPaymentInstrumentId() {
$paymentInstrumentID = CRM_Utils_Request::retrieve('payment_instrument_id', 'Integer');
- if ($paymentInstrumentID) {
- return $paymentInstrumentID;
- }
- return key(CRM_Core_OptionGroup::values('payment_instrument', FALSE, FALSE, FALSE, 'AND is_default = 1'));
+ return (int) ($paymentInstrumentID ?? $this->_paymentProcessor['payment_instrument_id']);
}
/**
diff --git a/civicrm/CRM/Contribute/Import/Parser/Contribution.php b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
index 41fe4b8e4b6169e31210447e2653e0369f8455ed..13b16a9ff22d9d8608875db9eef914b7c7c014ea 100644
--- a/civicrm/CRM/Contribute/Import/Parser/Contribution.php
+++ b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
@@ -671,6 +671,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa
}
}
}
+ continue;
}
switch ($key) {
diff --git a/civicrm/CRM/Core/BAO/CustomField.php b/civicrm/CRM/Core/BAO/CustomField.php
index 128c2a8841502016b78e3c3081b29664f95d6a25..b8c8f9543c602b7239fad83dd54cd2e7bdb5bfd5 100644
--- a/civicrm/CRM/Core/BAO/CustomField.php
+++ b/civicrm/CRM/Core/BAO/CustomField.php
@@ -1620,6 +1620,12 @@ SELECT $columnName
],
];
+ // If on MySQL 5.6 include ROW_FORMAT=DYNAMIC to fix unit tests
+ $databaseVersion = CRM_Utils_SQL::getDatabaseVersion();
+ if (version_compare($databaseVersion, '5.7', '<') && version_compare($databaseVersion, '5.6', '>=')) {
+ $table['attributes'] = $table['attributes'] . ' ROW_FORMAT=DYNAMIC';
+ }
+
if (!$params['is_multiple']) {
$table['indexes'] = [
[
diff --git a/civicrm/CRM/Core/DAO.php b/civicrm/CRM/Core/DAO.php
index a72e5cdf33df691715fd599909023168ddca2011..2b670ae91e729902507df4b2666215d7c0f2b95a 100644
--- a/civicrm/CRM/Core/DAO.php
+++ b/civicrm/CRM/Core/DAO.php
@@ -2407,7 +2407,6 @@ SELECT contact_id
$refsFound = [];
foreach (CRM_Core_DAO_AllCoreTables::getClasses() as $daoClassName) {
$links = $daoClassName::getReferenceColumns();
- $daoTableName = $daoClassName::getTableName();
foreach ($links as $refSpec) {
/** @var $refSpec CRM_Core_Reference_Interface */
diff --git a/civicrm/CRM/Dedupe/MergeHandler.php b/civicrm/CRM/Dedupe/MergeHandler.php
index 0bef4e3cc7525703b81063692e6138a748b65ceb..db454c0e70fc1a31aa2ad0e8a02f952b0dea5619 100644
--- a/civicrm/CRM/Dedupe/MergeHandler.php
+++ b/civicrm/CRM/Dedupe/MergeHandler.php
@@ -124,6 +124,13 @@ class CRM_Dedupe_MergeHandler {
if (!isset(\Civi::$statics[__CLASS__]['dynamic'])) {
\Civi::$statics[__CLASS__]['dynamic'] = [];
foreach (CRM_Core_DAO::getDynamicReferencesToTable('civicrm_contact') as $tableName => $field) {
+ if ($tableName === 'civicrm_financial_item') {
+ // It turns out that civicrm_financial_item does not have an index on entity_table (only as the latter
+ // part of a entity_id/entity_table index which probably is not adding any value over & above entity_id
+ // only. This means this is a slow query. The correct fix is probably to add a whitelist to
+ // values for entity_table in the schema.
+ continue;
+ }
$sql[] = "(SELECT '$tableName' as civicrm_table, '{$field[0]}' as field_name FROM $tableName WHERE entity_table = 'civicrm_contact' LIMIT 1)";
}
$sqlString = implode(' UNION ', $sql);
diff --git a/civicrm/CRM/Price/BAO/PriceField.php b/civicrm/CRM/Price/BAO/PriceField.php
index 9b3e0c9e195834a9440feb433eab116b054a98ec..cf3bf99f5f9dcf93ff34bd12d617aec52055b408 100644
--- a/civicrm/CRM/Price/BAO/PriceField.php
+++ b/civicrm/CRM/Price/BAO/PriceField.php
@@ -873,14 +873,10 @@ WHERE id IN (" . implode(',', array_keys($priceFields)) . ')';
public static function getVisibilityOptionID($visibilityName) {
if (!isset(self::$visibilityOptionsKeys)) {
- self::$visibilityOptionsKeys = CRM_Price_BAO_PriceField::buildOptions(
- 'visibility_id',
- NULL,
- [
- 'labelColumn' => 'name',
- 'flip' => TRUE,
- ]
- );
+ self::$visibilityOptionsKeys = CRM_Core_PseudoConstant::get('CRM_Price_BAO_PriceField', 'visibility_id', [
+ 'labelColumn' => 'name',
+ 'flip' => TRUE,
+ ]);
}
if (isset(self::$visibilityOptionsKeys[$visibilityName])) {
diff --git a/civicrm/CRM/Report/Form.php b/civicrm/CRM/Report/Form.php
index abbd87fd93aaffb348d349fa380281e2af282b16..f09de2def6efe856dd694eee5e371e78d75d5690 100644
--- a/civicrm/CRM/Report/Form.php
+++ b/civicrm/CRM/Report/Form.php
@@ -139,11 +139,6 @@ class CRM_Report_Form extends CRM_Core_Form {
*/
protected $_groupFilter = FALSE;
- /**
- * Required for civiexportexcel.
- */
- public $supportsExportExcel = TRUE;
-
/**
* Has the report been optimised for group filtering.
*
@@ -1440,7 +1435,7 @@ class CRM_Report_Form extends CRM_Core_Form {
if (!CRM_Core_Permission::check('view report sql')) {
return;
}
- $ignored_output_modes = ['pdf', 'csv', 'print', 'excel2007'];
+ $ignored_output_modes = ['pdf', 'csv', 'print'];
if (in_array($this->_outputMode, $ignored_output_modes)) {
return;
}
@@ -2862,11 +2857,6 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
$this->_absoluteUrl = TRUE;
$this->addPaging = FALSE;
}
- elseif ($this->_outputMode == 'excel2007') {
- $printOnly = TRUE;
- $this->_absoluteUrl = TRUE;
- $this->addPaging = FALSE;
- }
elseif ($this->_outputMode == 'copy' && $this->_criteriaForm) {
$this->_createNew = TRUE;
}
@@ -3501,9 +3491,6 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
elseif ($this->_outputMode == 'csv') {
CRM_Report_Utils_Report::export2csv($this, $rows);
}
- elseif ($this->_outputMode == 'excel2007') {
- CRM_CiviExportExcel_Utils_Report::export2excel2007($this, $rows);
- }
elseif ($this->_outputMode == 'group') {
$group = $this->_params['groups'];
$this->add2group($group);
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.26.2.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.26.2.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..614c9d2d2bc0809da044d91ad74a0fe90f5d1e33
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.26.2.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.26.2 during upgrade *}
diff --git a/civicrm/CRM/Utils/Check/Component/Schema.php b/civicrm/CRM/Utils/Check/Component/Schema.php
index fb4d253648993c9b378482ff5ddcb7812d0cb707..12d17d22030f4550b143b01e5604b54b50ed397f 100644
--- a/civicrm/CRM/Utils/Check/Component/Schema.php
+++ b/civicrm/CRM/Utils/Check/Component/Schema.php
@@ -178,4 +178,19 @@ class CRM_Utils_Check_Component_Schema extends CRM_Utils_Check_Component {
return $messages;
}
+ public function checkMoneyValueFormatConfig() {
+ $messages = [];
+ if (CRM_Core_Config::singleton()->moneyvalueformat !== '%!i') {
+ $msg = new CRM_Utils_Check_Message(
+ __FUNCTION__,
+ ts('<p>The Money Value format stored is deprecated please report your configuration on <a href="https://lab.civicrm.org/dev/core/-/issues/1494">Gitlab Issue</a>'),
+ ts('Deprectad money value format configuration'),
+ \Psr\Log\LogLevel::WARNING,
+ 'fa-server'
+ );
+ $messages[] = $msg;
+ }
+ return $messages;
+ }
+
}
diff --git a/civicrm/CRM/Utils/Money.php b/civicrm/CRM/Utils/Money.php
index bbe8072a25aec4b4fa4956af0f994538e107f433..551024153f7577d1019fca5ebf63de91e8cab6e4 100644
--- a/civicrm/CRM/Utils/Money.php
+++ b/civicrm/CRM/Utils/Money.php
@@ -61,6 +61,10 @@ class CRM_Utils_Money {
$valueFormat = $config->moneyvalueformat;
}
+ if (!empty($valueFormat) && $valueFormat !== '%!i') {
+ CRM_Core_Error::deprecatedFunctionWarning('Having a Money Value format other than !%i is deprecated, please report this on the GitLab Issue https://lab.civicrm.org/dev/core/-/issues/1494 with the relevant moneyValueFormat you use.');
+ }
+
if ($onlyNumber) {
// money_format() exists only in certain PHP install (CRM-650)
if (is_numeric($amount) and function_exists('money_format')) {
@@ -170,6 +174,9 @@ class CRM_Utils_Money {
* @return string
*/
protected static function formatLocaleNumeric($amount) {
+ if (CRM_Core_Config::singleton()->moneyvalueformat !== '%!i') {
+ CRM_Core_Error::deprecatedFunctionWarning('Having a Money Value format other than !%i is deprecated, please report this on GitLab with the relevant moneyValueFormat you use.');
+ }
return self::formatNumericByFormat($amount, CRM_Core_Config::singleton()->moneyvalueformat);
}
diff --git a/civicrm/api/v3/utils.php b/civicrm/api/v3/utils.php
index 3101e29480174cb7c6b0bc9222d6f418b61c0c63..a8e8e65d028fc69dd31bee5086366aa83fe5a0b7 100644
--- a/civicrm/api/v3/utils.php
+++ b/civicrm/api/v3/utils.php
@@ -2342,6 +2342,16 @@ function _civicrm_api3_api_match_pseudoconstant_value(&$value, $options, $fieldN
// CiviMagic syntax for Nulling out the field - let it through.
return;
}
+ // Legacy support for custom fields: If matching failed by name, fallback to label
+ // @see https://lab.civicrm.org/dev/core/-/issues/1816
+ if ($customFieldId = CRM_Core_BAO_CustomField::getKeyID($fieldName)) {
+ $field = new CRM_Core_BAO_CustomField();
+ $field->id = $customFieldId;
+ $options = array_map("strtolower", $field->getOptions());
+ $newValue = array_search(strtolower($value), $options);
+ }
+ }
+ if ($newValue === FALSE) {
throw new API_Exception("'$value' is not a valid option for field $fieldName", 2001, ['error_field' => $fieldName]);
}
$value = $newValue;
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index c45314145d4b57b8c5e1921cab491cc3833b6d12..58fe534bcfa13c24a75153f173efc07ca6c3a367 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.26.1',
+ return array( 'version' => '5.26.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index ec96c353a9659d16c60ecfa2f0a7ffeb2c94787b..b9c69e516ae6adb52a398ecbc3878649a9973f09 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.26.2
+
+Released June 16, 2020
+
+- **[Synopsis](release-notes/5.26.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.26.2.md#bugs)**
+- **[Credits](release-notes/5.26.2.md#credits)**
+- **[Feedback](release-notes/5.26.2.md#feedback)**
+
## CiviCRM 5.26.1
Released June 6, 2020
diff --git a/civicrm/release-notes/5.26.2.md b/civicrm/release-notes/5.26.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..7e73ac5d14338872ffd0fd0c400df4825452071a
--- /dev/null
+++ b/civicrm/release-notes/5.26.2.md
@@ -0,0 +1,44 @@
+# CiviCRM 5.26.2
+
+Released June 16, 2020
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities? | no |
+| 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** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_APIv3_: Restore support for auto-matching custom values by "`label`" ([dev/core#1816](https://lab.civicrm.org/dev/core/-/issues/1816): [#17628](https://github.com/civicrm/civicrm-core/pull/17628))**
+* **_CiviContribute_: Fix display of certain price options for anonymous users ([dev/core#1823](https://lab.civicrm.org/dev/core/-/issues/1823): [#17619](https://github.com/civicrm/civicrm-core/pull/17619))**
+* **_CiviContribute_: Fix issue with potentially getting the wrong `payment_instrument_id` [#17607](https://github.com/civicrm/civicrm-core/pull/17607))**
+* **_CiviContribute_: Fix import of "Radio"/"Select"-style custom fields using "`label`" data ([dev/core#1806](https://lab.civicrm.org/dev/core/-/issues/1806): [#17632](https://github.com/civicrm/civicrm-core/pull/17632))**
+* **_Dedupe_: Address performance issue stemming from overzealous lookup ([#17567](https://github.com/civicrm/civicrm-core/pull/17567))**
+* **_Localization_: Add deprecation notice for sites that have non-default value of `moneyvalueformat` ([dev/core#1494](https://lab.civicrm.org/dev/core/-/issues/1494): [#17577](https://github.com/civicrm/civicrm-core/pull/17577))**
+* **_Smart Groups_: Fix an error when populating certain smart groups [#17622](https://github.com/civicrm/civicrm-core/pull/17622))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tapas Datta; Semper IT - Karin Gerritsen;
+MJCO - Mikey O'Toole; MJW Consulting - Matt Wire; Megaphone Technology Consulting - Jon Goldberg;
+JMA Consulting - Seamus Lee; Francesc Bassas i Bullich; CiviCRM - Coleman Watts, Tim Otten
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew 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 5a68398f0f23feb34d72d2ff69eba3788b1d93d6..477f8b1bd53fd8f9aced71cc921bd4cd2cb5c073 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23896,4 +23896,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.26.1';
+UPDATE civicrm_domain SET version = '5.26.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index a570578cdab74622dea4721e77642cc42d9aba77..55c163ab73c6ad07889e3584f0795a7ec82ba9a3 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -399,7 +399,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.26.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.26.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
index c2e85291712b7bb0de115af80253d2ff7257706c..498e9f13a0c55d153ce6454cab81592f2acbfbc7 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
@@ -71,7 +71,7 @@
</tr>
<tr class="crm-localization-form-block-moneyvalueformat">
<td class="label">{$form.moneyvalueformat.label} {help id='moneyvalueformat' title=$form.moneyvalueformat.label}</td>
- <td>{$form.moneyvalueformat.html}</td>
+ <td>{$form.moneyvalueformat.html}<br> Note that this setting is proposed to be deprecated as per this <a href="https://lab.civicrm.org/dev/core/-/issues/1494">Gitlab Issue</a></td>
</tr>
<tr class="crm-localization-form-block-customTranslateFunction">
<td class="label">{$form.customTranslateFunction.label} {help id='customTranslateFunction' title=$form.customTranslateFunction.label}</td>
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 7cc0001f8e2c6ec45dbac81f91b8a4dab3d8d589..cc9a6cbbfd9de7c2b9a959edd991ba733fe60485 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit45391f7bcbb84a269977d27443da4e06::getLoader();
+return ComposerAutoloaderInitb2582f114b1248d5a20a7411671eea43::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index fa646daaef657c386ae24acedc8a0e29f593513c..c4f799abb533e9f44704776f6ebf47c5af495b5a 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 ComposerAutoloaderInit45391f7bcbb84a269977d27443da4e06
+class ComposerAutoloaderInitb2582f114b1248d5a20a7411671eea43
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit45391f7bcbb84a269977d27443da4e06
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit45391f7bcbb84a269977d27443da4e06', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitb2582f114b1248d5a20a7411671eea43', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit45391f7bcbb84a269977d27443da4e06', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitb2582f114b1248d5a20a7411671eea43', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit45391f7bcbb84a269977d27443da4e06
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit45391f7bcbb84a269977d27443da4e06::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInitb2582f114b1248d5a20a7411671eea43::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit45391f7bcbb84a269977d27443da4e06
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit45391f7bcbb84a269977d27443da4e06::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInitb2582f114b1248d5a20a7411671eea43::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire45391f7bcbb84a269977d27443da4e06($fileIdentifier, $file);
+ composerRequireb2582f114b1248d5a20a7411671eea43($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire45391f7bcbb84a269977d27443da4e06($fileIdentifier, $file)
+function composerRequireb2582f114b1248d5a20a7411671eea43($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 a61f661fd2f17c5ebc63746f0e47fe520e1ee954..ea477379058afbed58fc6e8993fa2edf5c7284fe 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit45391f7bcbb84a269977d27443da4e06
+class ComposerStaticInitb2582f114b1248d5a20a7411671eea43
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -495,11 +495,11 @@ class ComposerStaticInit45391f7bcbb84a269977d27443da4e06
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit45391f7bcbb84a269977d27443da4e06::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit45391f7bcbb84a269977d27443da4e06::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit45391f7bcbb84a269977d27443da4e06::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit45391f7bcbb84a269977d27443da4e06::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit45391f7bcbb84a269977d27443da4e06::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInitb2582f114b1248d5a20a7411671eea43::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInitb2582f114b1248d5a20a7411671eea43::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInitb2582f114b1248d5a20a7411671eea43::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInitb2582f114b1248d5a20a7411671eea43::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInitb2582f114b1248d5a20a7411671eea43::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 29ef61b3b2436dc71ba1446c7001ea2320a24d09..9a71db3eb87ad794aa33ebe38f320612158c1b8b 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.26.1</version_no>
+ <version_no>5.26.2</version_no>
</version>