diff --git a/civicrm.php b/civicrm.php
index c56bb890a841225ba0d34619c2848197f6b0d4f6..4df8a16b0eb8272f852198559ae74839e1b602cd 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,11 +2,10 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.10.1
+Version: 5.10.2
Author: CiviCRM LLC
Author URI: https://civicrm.org/
Plugin URI: https://wiki.civicrm.org/confluence/display/CRMDOC/Installing+CiviCRM+for+WordPress
-GitHub Plugin URI: https://github.com/tadpolecc/civicrm.git
License: AGPL3
Text Domain: civicrm
Domain Path: /languages
diff --git a/civicrm/CRM/ACL/BAO/ACL.php b/civicrm/CRM/ACL/BAO/ACL.php
index 4c003570200872c8f8fb52bc6f674b3a41d6d664..0b41703eb5a54a9e13553e159977ebc9f2825e4e 100644
--- a/civicrm/CRM/ACL/BAO/ACL.php
+++ b/civicrm/CRM/ACL/BAO/ACL.php
@@ -779,10 +779,10 @@ SELECT g.*
while ($dao->fetch()) {
$groupIDs[] = $dao->id;
- if (($dao->saved_search_id || $dao->children || $dao->parents) &&
- $dao->cache_date == NULL
- ) {
- CRM_Contact_BAO_GroupContactCache::load($dao);
+ if (($dao->saved_search_id || $dao->children || $dao->parents)) {
+ if ($dao->cache_date == NULL) {
+ CRM_Contact_BAO_GroupContactCache::load($dao);
+ }
$groupContactCacheClause = " UNION SELECT contact_id FROM civicrm_group_contact_cache WHERE group_id IN (" . implode(', ', $groupIDs) . ")";
}
diff --git a/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php b/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
index f7446aee0c5788002b3d8ffd0b98d892e97a1cea..fca17157c303fa6d2649ef60e971527dd2370494 100644
--- a/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
+++ b/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
@@ -173,7 +173,7 @@ class CRM_Case_Form_Activity_ChangeCaseStatus {
// Set case end_date if we're closing the case. Clear end_date if we're (re)opening it.
if (CRM_Utils_Array::value($params['case_status_id'], $groupingValues) == 'Closed' && !empty($params['activity_date_time'])) {
- $params['end_date'] = $params['activity_date_time'];
+ $params['end_date'] = CRM_Utils_Date::isoToMysql($params['activity_date_time']);
// End case-specific relationships (roles)
foreach ($params['target_contact_id'] as $cid) {
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/Form.php b/civicrm/CRM/Core/Form.php
index 21839f108e2cf9eb054391eaf37b1374a53c91ce..d6f5bd723fd03a93dce853cc4edfb77e8849c944 100644
--- a/civicrm/CRM/Core/Form.php
+++ b/civicrm/CRM/Core/Form.php
@@ -1300,6 +1300,9 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
if ($action & (CRM_Core_Action::VIEW + CRM_Core_Action::BROWSE + CRM_Core_Action::BASIC + CRM_Core_Action::ADVANCED + CRM_Core_Action::PREVIEW)) {
return 'get';
}
+ if ($action & (CRM_Core_Action::DELETE)) {
+ return 'delete';
+ }
// If you get this exception try adding more cases above.
throw new Exception("Cannot determine api action for " . get_class($this) . '.' . 'CRM_Core_Action "' . CRM_Core_Action::description($action) . '" not recognized.');
}
diff --git a/civicrm/CRM/Core/Form/EntityFormTrait.php b/civicrm/CRM/Core/Form/EntityFormTrait.php
index 102393d4b569762bb2de0642910f4248b382159b..6693f88dfafe341bf3554f854c0edf7c5d6240d8 100644
--- a/civicrm/CRM/Core/Form/EntityFormTrait.php
+++ b/civicrm/CRM/Core/Form/EntityFormTrait.php
@@ -250,6 +250,10 @@ trait CRM_Core_Form_EntityFormTrait {
// We can't load this field using metadata
continue;
}
+ if ($field != 'id' && $this->isDeleteContext()) {
+ // Delete forms don't generally present any fields to edit
+ continue;
+ }
// Resolve action.
if (empty($props['action'])) {
$props['action'] = $this->getApiAction();
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/Upgrade/Incremental/sql/5.10.2.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.10.2.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..1905da93b10d2eb0147474945073de41c69e56ce
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.10.2.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.10.2 during upgrade *}
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/bower_components/jquery-ui/.bower.json b/civicrm/bower_components/jquery-ui/.bower.json
index a37977e293dab1139234c1e11ff472e0011d1161..d28097dd886aa3254e1ae3f4b4c31a9a08723e8e 100644
--- a/civicrm/bower_components/jquery-ui/.bower.json
+++ b/civicrm/bower_components/jquery-ui/.bower.json
@@ -17,6 +17,6 @@
"commit": "44ecf3794cc56b65954cc19737234a3119d036cc"
},
"_source": "https://github.com/components/jqueryui.git",
- "_target": ">=1.9",
+ "_target": "~1.12",
"_originalSource": "jquery-ui"
}
\ No newline at end of file
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 2238c921ddaebdfb5dbee016886dff92baf6436d..189e1e947d0d27e4b32b5771f434456dfaac12c8 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.10.1',
+ return array( 'version' => '5.10.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes/5.10.2.md b/civicrm/release-notes/5.10.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..31cf3803ed85705ba9d8013109353cb627578856
--- /dev/null
+++ b/civicrm/release-notes/5.10.2.md
@@ -0,0 +1,56 @@
+# CiviCRM 5.10.2
+
+Released February 14, 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#681](https://lab.civicrm.org/dev/core/issues/681)) CiviCase - Fatal error
+ submitting "Change Case Status" form
+ ([13595](https://github.com/civicrm/civicrm-core/pull/13595))**
+
+ There was a fatal error generated when submitting the change case status form
+ because the end_date was not properly converted to MySQL date format.
+
+- **([dev/core#721](https://lab.civicrm.org/dev/core/issues/721)) ACLs - Fix regression
+ on rebuilding smart group caches when ACLs are used
+ ([13597](https://github.com/civicrm/civicrm-core/pull/13597))**
+
+ Fixed a recent regression whereby ability to see contacts permissioned by an
+ ACL over a smart group depended on the freshness of the group cache.
+
+- **([dev/core#715](https://lab.civicrm.org/dev/core/issues/715)) Relationships - Fix regression
+ preventing deletion of relationship types in UI.
+ ([13590](https://github.com/civicrm/civicrm-core/pull/13590))**
+
+ Fixed a recent regression whereby ability to delete a relationship type
+ from the user interface was broken.
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; MJW Consulting - Matthew Wire; Fuzion - Jitendra Purohit;
+CiviCRM - Mathieu Luffy and Coleman Watts; Australian Greens - Seamus Lee
+
+## <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 ce25029d7d2367e5e9b532d93975d582988d10dc..71ac9abc01f49f92f18ebc3f349e616fa3fbe8cf 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.1';
+UPDATE civicrm_domain SET version = '5.10.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index e05544ba28fab5e057652d3d8c703eebcf044d4b..48cbdc92a31d7fcd07a11699b287811c12517791 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.1',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.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 0db3742f4343b77cfe8eb3cc576353fdce18351a..cd0eaf2ddcefd8decc053670f730892ad793466a 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4::getLoader();
+return ComposerAutoloaderInit5e718c4122bc7ae544699b96c7638091::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 437ed36c28287a513d9e89e75116fb87e5b61b16..410673afc8a689200c7f72f3ca292efa004b0acc 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 ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4
+class ComposerAutoloaderInit5e718c4122bc7ae544699b96c7638091
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit5e718c4122bc7ae544699b96c7638091', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit5e718c4122bc7ae544699b96c7638091', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit5e718c4122bc7ae544699b96c7638091::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit5e718c4122bc7ae544699b96c7638091::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire4475206d531e7b9a0504d26f121dc3c4($fileIdentifier, $file);
+ composerRequire5e718c4122bc7ae544699b96c7638091($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire4475206d531e7b9a0504d26f121dc3c4($fileIdentifier, $file)
+function composerRequire5e718c4122bc7ae544699b96c7638091($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 7d03378b4a05b9f861f396c319161500e3dd1a97..c492da9f5019a9babe52a80e0962fce3c6234382 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4
+class ComposerStaticInit5e718c4122bc7ae544699b96c7638091
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -397,10 +397,10 @@ class ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$prefixesPsr0;
- $loader->classMap = ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit5e718c4122bc7ae544699b96c7638091::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit5e718c4122bc7ae544699b96c7638091::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit5e718c4122bc7ae544699b96c7638091::$prefixesPsr0;
+ $loader->classMap = ComposerStaticInit5e718c4122bc7ae544699b96c7638091::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index d962bee6e64698d4f04bb9c49ee1d72984c62bee..f57a6e688e5f2e8920a5f562398fd3a83bcd479c 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.1</version_no>
+ <version_no>5.10.2</version_no>
</version>
diff --git a/wp-cli/civicrm.php b/wp-cli/civicrm.php
index c740547873478451d092101c4a2ee393348bdfdb..f093e165ec90027bb70a2e16c605d3f96d56c960 100644
--- a/wp-cli/civicrm.php
+++ b/wp-cli/civicrm.php
@@ -165,12 +165,6 @@ if ( ! defined( 'CIVICRM_WPCLI_LOADED' ) ) {
return WP_CLI::error( "Unrecognized command - '$command'" );
}
- # if --path is set, save for later use by Civi
- global $civicrm_paths;
- if (!empty(WP_CLI::get_config('path'))) {
- $civicrm_paths['cms.root']['path'] = WP_CLI::get_config('path');
- }
-
# run command
return $this->{$command_router[ $command ]}();