diff --git a/civicrm.php b/civicrm.php
index bed16d7e846bacafcb852e8882fad89cad595f0d..b5e100ef0345a793f5efd43e36cb64598dc97b73 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.10.3
+Version: 5.10.4
Author: CiviCRM LLC
Author URI: https://civicrm.org/
Plugin URI: https://wiki.civicrm.org/confluence/display/CRMDOC/Installing+CiviCRM+for+WordPress
diff --git a/civicrm/CRM/Contact/BAO/Query.php b/civicrm/CRM/Contact/BAO/Query.php
index a935ca96d2c6e1937f4416580822d6eff073520f..cdd3f4761808fce1e52ccc2ac19b9a24a0411974 100644
--- a/civicrm/CRM/Contact/BAO/Query.php
+++ b/civicrm/CRM/Contact/BAO/Query.php
@@ -412,6 +412,8 @@ class CRM_Contact_BAO_Query {
public $_pseudoConstantsSelect = array();
+ public $_groupUniqueKey = NULL;
+
/**
* Class constructor which also does all the work.
*
@@ -3038,12 +3040,13 @@ class CRM_Contact_BAO_Query {
//CRM-19589: contact(s) removed from a Smart Group, resides in civicrm_group_contact table
$groupContactCacheClause = '';
if (count($smartGroupIDs) || empty($value)) {
- $gccTableAlias = "civicrm_group_contact_cache";
+ $this->_groupUniqueKey = uniqid();
+ $gccTableAlias = "civicrm_group_contact_cache_{$this->_groupUniqueKey}";
$groupContactCacheClause = $this->addGroupContactCache($smartGroupIDs, $gccTableAlias, "contact_a", $op);
if (!empty($groupContactCacheClause)) {
if ($isNotOp) {
$groupIds = implode(',', (array) $smartGroupIDs);
- $gcTable = "civicrm_group_contact";
+ $gcTable = "civicrm_group_contact_{$this->_groupUniqueKey}";
$joinClause = array("contact_a.id = {$gcTable}.contact_id");
$this->_tables[$gcTable] = $this->_whereTables[$gcTable] = " LEFT JOIN civicrm_group_contact {$gcTable} ON (" . implode(' AND ', $joinClause) . ")";
if (strpos($op, 'IN') !== FALSE) {
@@ -3069,6 +3072,10 @@ class CRM_Contact_BAO_Query {
}
}
+ public function getGroupCacheTableKey() {
+ return $this->_groupUniqueKey;
+ }
+
/**
* Function translates selection of group type into a list of groups.
* @param $value
diff --git a/civicrm/CRM/Contribute/Form/Task/Invoice.php b/civicrm/CRM/Contribute/Form/Task/Invoice.php
index d6e4758d4b7efea07f5f9f3650e31ce783d1e426..865f91b5a1ef7e513daac8a74cd2c69b6fb737c4 100644
--- a/civicrm/CRM/Contribute/Form/Task/Invoice.php
+++ b/civicrm/CRM/Contribute/Form/Task/Invoice.php
@@ -298,7 +298,13 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
$invoiceDate = date("F j, Y");
$dueDate = date('F j, Y', strtotime($contributionReceiveDate . "+" . $prefixValue['due_date'] . "" . $prefixValue['due_date_period']));
- $lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID);
+ if ($input['component'] == 'contribute') {
+ $lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID);
+ }
+ else {
+ $eid = $contribution->_relatedObjects['participant']->id;
+ $lineItem = CRM_Price_BAO_LineItem::getLineItems($eid, 'participant', NULL, TRUE, FALSE, TRUE);
+ }
$resultPayments = civicrm_api3('Payment', 'get', array(
'sequential' => 1,
diff --git a/civicrm/CRM/Core/Page/File.php b/civicrm/CRM/Core/Page/File.php
index 76d65e0a2f4c28dcad1fa1ce499dea9f683df9f5..e3b12d2a9289adebb569e7f0cb79a49ef232c17b 100644
--- a/civicrm/CRM/Core/Page/File.php
+++ b/civicrm/CRM/Core/Page/File.php
@@ -42,15 +42,29 @@ class CRM_Core_Page_File extends CRM_Core_Page {
$download = CRM_Utils_Request::retrieve('download', 'Integer', $this, FALSE, 1);
$disposition = $download == 0 ? 'inline' : 'download';
- $entityId = CRM_Utils_Request::retrieve('eid', 'Positive', $this, TRUE); // Entity ID (e.g. Contact ID)
+ $entityId = CRM_Utils_Request::retrieve('eid', 'Positive', $this, FALSE); // Entity ID (e.g. Contact ID)
$fieldId = CRM_Utils_Request::retrieve('fid', 'Positive', $this, FALSE); // Field ID
- $fileId = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE); // File ID
- $hash = CRM_Utils_Request::retrieve('fcs', 'Alphanumeric', $this);
- if (!CRM_Core_BAO_File::validateFileHash($hash, $entityId, $fileId)) {
- CRM_Core_Error::statusBounce('URL for file is not valid');
+ $fileId = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE); // File ID
+ $fileName = CRM_Utils_Request::retrieve('filename', 'String', $this, FALSE);
+ if (empty($fileName) && (empty($entityId) || empty($fileId))) {
+ CRM_Core_Error::statusBounce("Cannot access file: Must pass either \"Filename\" or the combination of \"Entity ID\" + \"File ID\"");
}
- list($path, $mimeType) = CRM_Core_BAO_File::path($fileId, $entityId);
+ if (empty($fileName)) {
+ $hash = CRM_Utils_Request::retrieve('fcs', 'Alphanumeric', $this);
+ if (!CRM_Core_BAO_File::validateFileHash($hash, $entityId, $fileId)) {
+ CRM_Core_Error::statusBounce('URL for file is not valid');
+ }
+
+ list($path, $mimeType) = CRM_Core_BAO_File::path($fileId, $entityId);
+ }
+ else {
+ if (!CRM_Utils_File::isValidFileName($fileName)) {
+ throw new CRM_Core_Exception("Malformed filename");
+ }
+ $mimeType = '';
+ $path = CRM_Core_Config::singleton()->customFileUploadDir . $fileName;
+ }
$mimeType = CRM_Utils_Request::retrieveValue('mime-type', 'String', $mimeType, FALSE);
if (!$path) {
diff --git a/civicrm/CRM/Core/Payment/AuthorizeNet.php b/civicrm/CRM/Core/Payment/AuthorizeNet.php
index 3a6479cf4495883f120487f230b261c37a24e616..1b1ddde77488973b693707e98d2abf3100e879d5 100644
--- a/civicrm/CRM/Core/Payment/AuthorizeNet.php
+++ b/civicrm/CRM/Core/Payment/AuthorizeNet.php
@@ -171,6 +171,12 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment {
// fetch available contribution statuses
$contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
+ // check gateway MD5 response
+ if (!$this->checkMD5($response_fields[37], $response_fields[6], $response_fields[9])) {
+ $params['payment_status_id'] = array_search('Failed', $contributionStatus);
+ return self::error(9003, 'MD5 Verification failed');
+ }
+
// check for application errors
// TODO:
// AVS, CVV2, CAVV, and other verification results
@@ -431,6 +437,39 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment {
}
}
+ /**
+ * Check the gateway MD5 response to make sure that this is a proper
+ * gateway response
+ *
+ * @param string $responseMD5
+ * MD5 hash generated by the gateway.
+ * @param string $transaction_id
+ * Transaction id generated by the gateway.
+ * @param string $amount
+ * Purchase amount.
+ *
+ * @param bool $ipn
+ *
+ * @return bool
+ */
+ public function checkMD5($responseMD5, $transaction_id, $amount, $ipn = FALSE) {
+ // cannot check if no MD5 hash
+ $md5Hash = $this->_getParam('md5Hash');
+ if (empty($md5Hash)) {
+ return TRUE;
+ }
+ $loginid = $this->_getParam('apiLogin');
+ $hashString = $ipn ? ($md5Hash . $transaction_id . $amount) : ($md5Hash . $loginid . $transaction_id . $amount);
+ $result = strtoupper(md5($hashString));
+
+ if ($result == $responseMD5) {
+ return TRUE;
+ }
+ else {
+ return FALSE;
+ }
+ }
+
/**
* Calculate and return the transaction fingerprint.
*
diff --git a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
index 8455449c8da01d64cc597d5561db8f09e607692e..9f33ad14dbdbbce9833729240b1688e29462ee12 100644
--- a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -164,6 +164,8 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
$objects['contribution']->total_amount = $input['amount'];
$objects['contribution']->trxn_id = $input['trxn_id'];
+ $this->checkMD5($paymentProcessorObject, $input);
+
$isFirstOrLastRecurringPayment = FALSE;
if ($input['response_code'] == 1) {
// Approved
@@ -357,4 +359,25 @@ INNER JOIN civicrm_membership_payment mp ON m.id = mp.membership_id AND mp.contr
return $value;
}
+ /**
+ * Check and validate gateway MD5 response if present.
+ *
+ * @param CRM_Core_Payment_AuthorizeNet $paymentObject
+ * @param array $input
+ *
+ * @throws CRM_Core_Exception
+ */
+ public function checkMD5($paymentObject, $input) {
+ if (empty($input['trxn_id'])) {
+ // For decline we have nothing to check against.
+ return;
+ }
+ if (!$paymentObject->checkMD5($input['MD5_Hash'], $input['trxn_id'], $input['amount'], TRUE)) {
+ $message = "Failure: Security verification failed";
+ $log = new CRM_Utils_SystemLogger();
+ $log->error('payment_notification', array('message' => $message, 'input' => $input));
+ throw new CRM_Core_Exception($message);
+ }
+ }
+
}
diff --git a/civicrm/CRM/Report/Form/Contribute/Detail.php b/civicrm/CRM/Report/Form/Contribute/Detail.php
index 6365ccd8ef0d80f45c11df3d254c602fd86ac211..10690896e7d06e6c91e4e3618beea1b926890e82 100644
--- a/civicrm/CRM/Report/Form/Contribute/Detail.php
+++ b/civicrm/CRM/Report/Form/Contribute/Detail.php
@@ -472,9 +472,10 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency";
*
* @return string
*/
- public function buildQuery($applyLimit = TRUE) {
+ public function buildQuery($applyLimit = FALSE) {
if ($this->isTempTableBuilt) {
- return "SELECT * FROM civireport_contribution_detail_temp3 $this->_orderBy";
+ $this->limit();
+ return "SELECT SQL_CALC_FOUND_ROWS * FROM civireport_contribution_detail_temp3 $this->_orderBy $this->_limit";
}
return parent::buildQuery($applyLimit);
}
@@ -509,7 +510,6 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency";
// 1. use main contribution query to build temp table 1
$sql = $this->buildQuery();
$this->createTemporaryTable('civireport_contribution_detail_temp1', $sql);
- $this->setPager();
// 2. customize main contribution query for soft credit, and build temp table 2 with soft credit contributions only
$this->queryMode = 'SoftCredit';
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.10.4.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.10.4.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..030cbdfa25b6329de7d59c5ba94400caaea324a5
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.10.4.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.10.4 during upgrade *}
diff --git a/civicrm/CRM/Utils/File.php b/civicrm/CRM/Utils/File.php
index 65ab3af37ca9ccb63910d68f62cf401e9a27900a..1e8bd3ddb5de3dcfb8c96cae1f75331a6760b6a4 100644
--- a/civicrm/CRM/Utils/File.php
+++ b/civicrm/CRM/Utils/File.php
@@ -1034,4 +1034,23 @@ HTACCESS;
return $iconClasses['*'];
}
+ /**
+ * Is the filename a safe and valid filename passed in from URL
+ *
+ * @param string $fileName
+ * @return bool
+ */
+ public static function isValidFileName($fileName = NULL) {
+ if ($fileName) {
+ $check = $fileName !== basename($fileName) ? FALSE : TRUE;
+ if ($check) {
+ if (substr($fileName, 0, 1) == '/' || substr($fileName, 0, 1) == '.' || substr($fileName, 0, 1) == DIRECTORY_SEPARATOR) {
+ $check = FALSE;
+ }
+ }
+ return $check;
+ }
+ return FALSE;
+ }
+
}
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index bb0fa46b3de0137d243d3631d8b807343729db61..7dd040872e2ea92afec149003e37f2efde01f522 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -815,13 +815,11 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
$contactCreated = 0;
$contactMatching = 0;
- // previously used $wpdb - which means WordPress *must* be bootstrapped
- $wpUsers = get_users(array(
- 'blog_id' => get_current_blog_id(),
- 'number' => -1,
- ));
+ global $wpdb;
+ $wpUserIds = $wpdb->get_col("SELECT $wpdb->users.ID FROM $wpdb->users");
- foreach ($wpUsers as $wpUserData) {
+ foreach ($wpUserIds as $wpUserId) {
+ $wpUserData = get_userdata($wpUserId);
$contactCount++;
if ($match = CRM_Core_BAO_UFMatch::synchronizeUFMatch($wpUserData,
$wpUserData->$id,
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 1dc0bd6c970d5ddb00d5e7193621bcc228ea7fe0..3a4ab14a5afe9a34ea653424b1ae2127dcd56de8 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.10.3',
+ return array( 'version' => '5.10.4',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes/5.10.4.md b/civicrm/release-notes/5.10.4.md
new file mode 100644
index 0000000000000000000000000000000000000000..06aa41b5453e39b6f0362f6d0460809158d05d90
--- /dev/null
+++ b/civicrm/release-notes/5.10.4.md
@@ -0,0 +1,59 @@
+# CiviCRM 5.10.4
+
+Released February 22, 2019
+
+- **[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
+
+- **([dev/core#747](https://lab.civicrm.org/dev/core/issues/747)) Cannot
+ load contact images on contact screen following security release
+ ([13679](https://github.com/civicrm/civicrm-core/pull/13679))**
+
+ Following the security release, loading of images on the contact summary
+ screen broke due to the removal of handling of the filename url parameter
+
+- **([dev/report#10](https://lab.civicrm.org/dev/report/issues/10)) Pagination
+ doesn't work on the contribution detail report
+ ([13677](https://github.com/civicrm/civicrm-core/pull/13677))**
+
+ Fixed a recent regression where the pagination on the contribution detail report
+ broke.
+
+- **([dev/core#746](https://lab.civicrm.org/dev/core/issues/746)) Search Builder - Fix
+ regression when > 1 smart group where clauses were used
+ ([13667](https://github.com/civicrm/civicrm-core/pull/13667))**
+
+ Fixed a recent regression whereby if you had > 1 where clauses involving groups
+ and the groups were smart groups it wouldn't return the correct results
+
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Fuzion - Jitendra Purohit;
+Semper IT - Karin Gerritsen; CiviCRM - Tim Otten;
+Australian Greens - Seamus Lee; Blackfly Solutions - Alan Dixon;
+Megaphone Technology Consulting - Jon Goldberg;
+
+## <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 127546d2c896a623adf4c63ad5f9c4112e9590f4..4af5ec13158dc37df5bb8d24a2b65a4fd9c2f962 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -24043,4 +24043,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.10.3';
+UPDATE civicrm_domain SET version = '5.10.4';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 554f0fd6be29752bbf44f58bb9aea584859edf01..c4568e71c06beb6f98f8ed7411086a81b22a6156 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`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.10.3',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.10.4',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 0a099a095ae431a24801d9b6e1c1531baa12515e..ef6475fe09d6a15a0c643018c97286d04bd3a2bf 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitebbfd5c6742662296f73aa7fff5d3c56::getLoader();
+return ComposerAutoloaderInitc5b733dde8aafbae6e2efa95d0e10a1b::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index e8dd42fac15c891f43bb16ed87b53bb30ea9793d..db7692ead4202f810c51ad82c70784b1ebf0d33c 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 ComposerAutoloaderInitebbfd5c6742662296f73aa7fff5d3c56
+class ComposerAutoloaderInitc5b733dde8aafbae6e2efa95d0e10a1b
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitebbfd5c6742662296f73aa7fff5d3c56
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitebbfd5c6742662296f73aa7fff5d3c56', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitc5b733dde8aafbae6e2efa95d0e10a1b', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitebbfd5c6742662296f73aa7fff5d3c56', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitc5b733dde8aafbae6e2efa95d0e10a1b', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInitebbfd5c6742662296f73aa7fff5d3c56
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitebbfd5c6742662296f73aa7fff5d3c56::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInitc5b733dde8aafbae6e2efa95d0e10a1b::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInitebbfd5c6742662296f73aa7fff5d3c56
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitebbfd5c6742662296f73aa7fff5d3c56::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInitc5b733dde8aafbae6e2efa95d0e10a1b::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequireebbfd5c6742662296f73aa7fff5d3c56($fileIdentifier, $file);
+ composerRequirec5b733dde8aafbae6e2efa95d0e10a1b($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequireebbfd5c6742662296f73aa7fff5d3c56($fileIdentifier, $file)
+function composerRequirec5b733dde8aafbae6e2efa95d0e10a1b($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 04e9a27292d8d16a874ddc46c70f7bbbbc6951c9..b9c91bb35ee57b286e1e3a39d1ddaa6aefd6e99e 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitebbfd5c6742662296f73aa7fff5d3c56
+class ComposerStaticInitc5b733dde8aafbae6e2efa95d0e10a1b
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -397,10 +397,10 @@ class ComposerStaticInitebbfd5c6742662296f73aa7fff5d3c56
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitebbfd5c6742662296f73aa7fff5d3c56::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitebbfd5c6742662296f73aa7fff5d3c56::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitebbfd5c6742662296f73aa7fff5d3c56::$prefixesPsr0;
- $loader->classMap = ComposerStaticInitebbfd5c6742662296f73aa7fff5d3c56::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInitc5b733dde8aafbae6e2efa95d0e10a1b::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInitc5b733dde8aafbae6e2efa95d0e10a1b::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInitc5b733dde8aafbae6e2efa95d0e10a1b::$prefixesPsr0;
+ $loader->classMap = ComposerStaticInitc5b733dde8aafbae6e2efa95d0e10a1b::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index d3ad50fc923276f0a74f2f7dae30d6e8dac08514..759b098e6a62e64e3ca88935d6a6bd276b2b5a0e 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.10.3</version_no>
+ <version_no>5.10.4</version_no>
</version>