diff --git a/civicrm.php b/civicrm.php
index 77feb677dbcbf91b51c8788544affcb73aa8069a..6d969a193d877135b31c205abb8f5849c413d086 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.52.2
+ * Version: 5.52.3
* Requires at least: 4.9
* Requires PHP: 7.2
* 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.52.2');
+define('CIVICRM_PLUGIN_VERSION', '5.52.3');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Contribute/Import/Parser/Contribution.php b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
index 9c4a4bbd249d23e866c604cdf9fe98eddee8910b..eed146f4cb0d6cf9baa04b183a79b9ac2b781e20 100644
--- a/civicrm/CRM/Contribute/Import/Parser/Contribution.php
+++ b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
@@ -306,7 +306,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
$paramValues['contact_type'] = $this->getContactType();
}
elseif ($this->isUpdateExisting() &&
- (!empty($paramValues['contribution_id']) || !empty($values['trxn_id']) || !empty($paramValues['invoice_id']))
+ (!empty($paramValues['id']) || !empty($values['trxn_id']) || !empty($paramValues['invoice_id']))
) {
$paramValues['contact_type'] = $this->getContactType();
}
@@ -329,9 +329,9 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
if ($this->isUpdateExisting()) {
//fix for CRM-2219 - Update Contribution
// onDuplicate == CRM_Import_Parser::DUPLICATE_UPDATE
- if (!empty($paramValues['invoice_id']) || !empty($paramValues['trxn_id']) || !empty($paramValues['contribution_id'])) {
+ if (!empty($paramValues['invoice_id']) || !empty($paramValues['trxn_id']) || !empty($paramValues['id'])) {
$dupeIds = [
- 'id' => $paramValues['contribution_id'] ?? NULL,
+ 'id' => $paramValues['id'] ?? NULL,
'trxn_id' => $paramValues['trxn_id'] ?? NULL,
'invoice_id' => $paramValues['invoice_id'] ?? NULL,
];
@@ -684,12 +684,14 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
$params['contribution_contact_id'] = $matchingContactIds[0];
}
}
- elseif (!empty($params['contribution_id']) || !empty($params['trxn_id']) || !empty($params['invoice_id'])) {
+ elseif (!empty($params['id']) || !empty($params['trxn_id']) || !empty($params['invoice_id'])) {
// when update mode check contribution id or trxn id or
// invoice id
+ // @todo - this check is obsolete. It survives for now
+ // in order to keep the rc patch small & non-conflicty.
$contactId = new CRM_Contribute_DAO_Contribution();
- if (!empty($params['contribution_id'])) {
- $contactId->id = $params['contribution_id'];
+ if (!empty($params['id'])) {
+ $contactId->id = $params['id'];
}
elseif (!empty($params['trxn_id'])) {
$contactId->trxn_id = $params['trxn_id'];
diff --git a/civicrm/CRM/Import/Form/Preview.php b/civicrm/CRM/Import/Form/Preview.php
index 5fff559d0acc47d926665c225b2e468bc6d2e9ed..693a612f46e142ea37592a5a96e1fc89ed103acc 100644
--- a/civicrm/CRM/Import/Form/Preview.php
+++ b/civicrm/CRM/Import/Form/Preview.php
@@ -43,38 +43,7 @@ abstract class CRM_Import_Form_Preview extends CRM_Import_Forms {
* Build the form object.
*/
public function buildQuickForm() {
-
- // FIXME: This is a hack...
- // The tpl contains javascript that starts the import on form submit
- // Since our back/cancel buttons are of html type "submit" we have to prevent a form submit event when they are clicked
- // Hacking in some onclick js to make them act more like links instead of buttons
- $path = CRM_Utils_System::currentPath();
- $query = ['_qf_MapField_display' => 'true'];
- $qfKey = CRM_Utils_Request::retrieve('qfKey', 'String');
- if (CRM_Utils_Rule::qfKey($qfKey)) {
- $query['qfKey'] = $qfKey;
- }
- $previousURL = CRM_Utils_System::url($path, $query, FALSE, NULL, FALSE);
- $cancelURL = CRM_Utils_System::url($path, 'reset=1', FALSE, NULL, FALSE);
-
- $this->addButtons([
- [
- 'type' => 'back',
- 'name' => ts('Previous'),
- 'js' => ['onclick' => "location.href='{$previousURL}'; return false;"],
- ],
- [
- 'type' => 'next',
- 'name' => ts('Import Now'),
- 'spacing' => ' ',
- 'isDefault' => TRUE,
- ],
- [
- 'type' => 'cancel',
- 'name' => ts('Cancel'),
- 'js' => ['onclick' => "location.href='{$cancelURL}'; return false;"],
- ],
- ]);
+ $this->addButtons($this->getButtons());
}
/**
@@ -146,4 +115,47 @@ abstract class CRM_Import_Form_Preview extends CRM_Import_Forms {
$runner->runAllViaWeb();
}
+ /**
+ * Get the buttons for the form.
+ *
+ * @return array|array[]
+ * @throws \CRM_Core_Exception
+ */
+ private function getButtons(): array {
+ // FIXME: This is a hack...
+ // The tpl contains javascript that starts the import on form submit
+ // Since our back/cancel buttons are of html type "submit" we have to prevent a form submit event when they are clicked
+ // Hacking in some onclick js to make them act more like links instead of buttons
+ $path = CRM_Utils_System::currentPath();
+ $query = ['_qf_MapField_display' => 'true'];
+ $qfKey = CRM_Utils_Request::retrieve('qfKey', 'String');
+ if (CRM_Utils_Rule::qfKey($qfKey)) {
+ $query['qfKey'] = $qfKey;
+ }
+ $previousURL = CRM_Utils_System::url($path, $query, FALSE, NULL, FALSE);
+ $cancelURL = CRM_Utils_System::url($path, 'reset=1', FALSE, NULL, FALSE);
+ $buttons = [
+ [
+ 'type' => 'back',
+ 'name' => ts('Previous'),
+ 'js' => ['onclick' => "location.href='{$previousURL}'; return false;"],
+ ],
+ ];
+ if ($this->hasImportableRows()) {
+ $buttons[] = [
+ 'type' => 'next',
+ 'name' => ts('Import Now'),
+ 'spacing' => ' ',
+ 'isDefault' => TRUE,
+ ];
+ }
+ $buttons[] = [
+ 'type' => 'cancel',
+ 'name' => ts('Cancel'),
+ 'js' => ['onclick' => "location.href='{$cancelURL}'; return false;"],
+ ];
+
+ return $buttons;
+ }
+
}
diff --git a/civicrm/CRM/Import/Forms.php b/civicrm/CRM/Import/Forms.php
index c9636b25bcff91a516c528a8832d069f97661759..a274f8ceb2490f5f5f7eafde9f8a8de3a6f2d70f 100644
--- a/civicrm/CRM/Import/Forms.php
+++ b/civicrm/CRM/Import/Forms.php
@@ -683,4 +683,15 @@ class CRM_Import_Forms extends CRM_Core_Form {
return ((int) $this->getSubmittedValue('onDuplicate')) === CRM_Import_Parser::DUPLICATE_SKIP;
}
+ /**
+ * Are there valid rows to import.
+ *
+ * @return bool
+ *
+ * @throws \CRM_Core_Exception
+ */
+ protected function hasImportableRows(): bool {
+ return (bool) $this->getRowCount(['new']);
+ }
+
}
diff --git a/civicrm/CRM/Import/Parser.php b/civicrm/CRM/Import/Parser.php
index 08c779f04518a69ff46caec61feb6c5aed9e5590..836d424ce994383e5a5f0d28059dd0d88515f24c 100644
--- a/civicrm/CRM/Import/Parser.php
+++ b/civicrm/CRM/Import/Parser.php
@@ -1301,7 +1301,7 @@ abstract class CRM_Import_Parser implements UserJobInterface {
}
else {
foreach ($required as $field => $label) {
- if (empty($params[$field])) {
+ if (!isset($params[$field]) || $params[$field] === '') {
$missing[$field] = $label;
}
}
diff --git a/civicrm/CRM/Member/Import/Parser/Membership.php b/civicrm/CRM/Member/Import/Parser/Membership.php
index 5c6dbc9b22ee484cbdb809afc9ac7c0374929cf6..51cd93dcc18233a12cfbd640da4efd2a755b351a 100644
--- a/civicrm/CRM/Member/Import/Parser/Membership.php
+++ b/civicrm/CRM/Member/Import/Parser/Membership.php
@@ -461,7 +461,7 @@ class CRM_Member_Import_Parser_Membership extends CRM_Import_Parser {
* @return string[]
*/
protected function getOddlyMappedMetadataFields(): array {
- $uniqueNames = ['membership_id', 'membership_contact_id'];
+ $uniqueNames = ['membership_id', 'membership_contact_id', 'membership_start_date', 'membership_join_date', 'membership_end_date', 'membership_source', 'member_is_override', 'member_is_test', 'member_is_pay_later', 'member_campaign_id'];
$fields = [];
foreach ($uniqueNames as $name) {
$fields[$this->importableFieldsMetadata[$name]['name']] = $name;
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 309d56c6251936ba39618c6194832ffd18309d56..e70604aeed0006c8d42b1c3d6f3ec90b045d11eb 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.52.2',
+ return array( 'version' => '5.52.3',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 6bf09181686cb1af9a2c0af2b6d0f96c3e13d51c..a07e3a29ebf2636dfeb9fe59b83b40ed0b870e9b 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.52.2</version>
+ <version>5.52.3</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index b2e2d0756a26fb4a069f469ba201d9d40ad1fab4..1585d67c3ae8d0ab36144904027a525e51c8dfb9 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.52.2</version>
+ <version>5.52.3</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 53efa664452b5ed1df556709eca540dd63bafb81..c59dc16fb24047289ef203afa8a5708a43bc1153 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.52.2</version>
+ <version>5.52.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index bf4aea22fbd80d9fc328b32506285916c9b60ace..71bf118f789c0a8b33c61a066d6e7741d5c44187 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.52.2</version>
+ <version>5.52.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index c6e85e7177153d3026cf4f5f5e5557ca7a0fb01d..2186abbf7c62264bb1840899621cd51ef22654ea 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.52.2</version>
+ <version>5.52.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index 2d847b7dab506cfc375c5f86caaeb8e6d70da868..f80ab8bddf040cdf33833f8e7daf4c621d141915 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.52.2</version>
+ <version>5.52.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 7c5185fe304b61a2f917c61a447af6bb80bd8b40..db6410c752404e4655acf1972e14193c8029900a 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.52.2</version>
+ <version>5.52.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 71aa3fb521a362b507ec056a4e470cec05efa41e..7bec6292dec821d56727df57e378b11a45fcf429 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.52.2</version>
+ <version>5.52.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 4fe42e753a5585bd2fe2bc424f34ad6a02f45e05..ab3f5b2f78ccdf70b3b7d9e462f05eb2b9d25321 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.52.2</version>
+ <version>5.52.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 3ca17a2ed64d4bd313a06003ca97cf62f94fe8c8..c34f54451fbdfb5502ca9260b06c23e94b066e11 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.52.2</version>
+ <version>5.52.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 497e7d901dced562a76c61c616bc000216ba432c..00c324e5bd1add576b805b8f1c4535750221632f 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.52.2</version>
+ <version>5.52.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 97342b252015dd5204b496ce96c6c6bf3070a3c1..36bfca148befdf515ca7af8ede05f55dbac5b8c9 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.52.2</version>
+ <version>5.52.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 5b38bcd0812c4e0940724a21fd97180013d3e5d7..a36a0b2a0485c8dbd684933f7268d9d90d292651 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.52.2</version>
+ <version>5.52.3</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 9163a10727aa3ba0b22a253413d37fe10c8dcd71..54f28edf37f66edf388470344e4de59f233adc25 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.52.2</version>
+ <version>5.52.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index f1fed806a8c92c21a2ac3f9f7ee25dbb31821ad4..4cd2e2708c4d848839d6634df78d76798cc4d8fd 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.52.2</version>
+ <version>5.52.3</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 be743ea559fdf3db3ff6b6dd06a94d462c2bd54c..dabf0179ab42faf5366e2873376c562c0c66c493 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.52.2</version>
+ <version>5.52.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index ef8cac69b4eef8a679d82f47a764b28cc6412871..822ae754037d77c79470a47976986c84375026fd 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.52.2</version>
+ <version>5.52.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 15ca99453bd502807b1422efa335d6dc477bef1c..1673c4d3c070d49a8e6e84883269271d7c2139e2 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.52.2</version>
+ <version>5.52.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index ae457876e9633a3ff48ffb06963ac5c2e9321e3d..a7e315748d3db51b0fce91e96a322ae12663b1d0 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.52.2</version>
+ <version>5.52.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 3df3a28760bab4d74739eb6ae919f989453a24f7..1f9f5079f25addafc953e4649d7657e30c13ddc8 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.52.2</version>
+ <version>5.52.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 85cd08eda92c1b61d3754933df34528b49b3961e..c14e42f32477384883efe7f09d39efedf782da5d 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.52.2</version>
+ <version>5.52.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 3de4fc535476fc3d93153af779a832925d5d95d2..c50834843f61aae6ab4b680772564182a8a468c1 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.52.3
+
+Released August 30, 2022
+
+- **[Synopsis](release-notes/5.52.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.52.3.md#bugs)**
+- **[Credits](release-notes/5.52.3.md#credits)**
+- **[Feedback](release-notes/5.52.3.md#feedback)**
+
## CiviCRM 5.52.2
Released August 12, 2022
diff --git a/civicrm/release-notes/5.52.3.md b/civicrm/release-notes/5.52.3.md
new file mode 100644
index 0000000000000000000000000000000000000000..907ab9bd0a16968f315b33f380982da0479ed827
--- /dev/null
+++ b/civicrm/release-notes/5.52.3.md
@@ -0,0 +1,39 @@
+# CiviCRM 5.52.3
+
+Released August 30, 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? | 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
+
+* **_CiviContribute_: Fix import error "No matching Contact found for ()" ([dev/core#3820](https://lab.civicrm.org/dev/core/-/issues/3820): [#24366](https://github.com/civicrm/civicrm-core/pull/24366))**
+* **_CiviContribute_: Restore support for importing "total_amount=0" ([dev/core#3828](https://lab.civicrm.org/dev/core/-/issues/3828): [#24414](https://github.com/civicrm/civicrm-core/pull/24414))**
+* **_CiviMember_: Fix import error regarding "getFieldMetadata()" ([#24349](https://github.com/civicrm/civicrm-core/pull/24349))**
+* **_Importer_: Disable "Import" button if batch contains no importable data ([#24346](https://github.com/civicrm/civicrm-core/pull/24346))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tobias Krause; JMA Consulting - Seamus Lee;
+Digitalcourage - Detlev Sieber; 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 4222dad52b277dcd13b7ae3ca6434c4533ee08c1..2238b7ac9d34c7ab26f2db4d871b5ef3eb8589d2 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23825,4 +23825,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.52.2';
+UPDATE civicrm_domain SET version = '5.52.3';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index dfedb013088f7decd2f3ed283259dba8acd8b17f..cf5bbc3c991d5c9d356a2a71ba223ac3627dfd2e 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2915,7 +2915,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.52.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.52.3',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 569ccb8ad7f968a99a7bb1b56a2f101853fa161d..c6ba03947c112e00e5a83685e7b2dcf67f50a257 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit164137b64ea9df92f079b3120f5ce8b4::getLoader();
+return ComposerAutoloaderInitdd5c8343fef6ba97439bf947c775e780::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 0176e606142cefb1711cb61b49c2951812666605..721e52250ac27d3a2c646289081a4696ae304cf6 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 ComposerAutoloaderInit164137b64ea9df92f079b3120f5ce8b4
+class ComposerAutoloaderInitdd5c8343fef6ba97439bf947c775e780
{
private static $loader;
@@ -24,22 +24,22 @@ class ComposerAutoloaderInit164137b64ea9df92f079b3120f5ce8b4
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit164137b64ea9df92f079b3120f5ce8b4', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitdd5c8343fef6ba97439bf947c775e780', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
- spl_autoload_unregister(array('ComposerAutoloaderInit164137b64ea9df92f079b3120f5ce8b4', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitdd5c8343fef6ba97439bf947c775e780', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
set_include_path(implode(PATH_SEPARATOR, $includePaths));
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInitdd5c8343fef6ba97439bf947c775e780::getInitializer($loader));
$loader->register(true);
- $includeFiles = \Composer\Autoload\ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4::$files;
+ $includeFiles = \Composer\Autoload\ComposerStaticInitdd5c8343fef6ba97439bf947c775e780::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire164137b64ea9df92f079b3120f5ce8b4($fileIdentifier, $file);
+ composerRequiredd5c8343fef6ba97439bf947c775e780($fileIdentifier, $file);
}
return $loader;
@@ -51,7 +51,7 @@ class ComposerAutoloaderInit164137b64ea9df92f079b3120f5ce8b4
* @param string $file
* @return void
*/
-function composerRequire164137b64ea9df92f079b3120f5ce8b4($fileIdentifier, $file)
+function composerRequiredd5c8343fef6ba97439bf947c775e780($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 0b5cf0b3be814c18b5239e061d48929d4c8788c4..a3e9c5166562524e03e3f3721446b01ec6905056 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4
+class ComposerStaticInitdd5c8343fef6ba97439bf947c775e780
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -722,11 +722,11 @@ class ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit164137b64ea9df92f079b3120f5ce8b4::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInitdd5c8343fef6ba97439bf947c775e780::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInitdd5c8343fef6ba97439bf947c775e780::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInitdd5c8343fef6ba97439bf947c775e780::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInitdd5c8343fef6ba97439bf947c775e780::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInitdd5c8343fef6ba97439bf947c775e780::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/include_paths.php b/civicrm/vendor/composer/include_paths.php
index 5386e5c83092fb28fb0ad8c81e99f6ce4e93ead5..c1d457fc4f61212d9510f575ac4c9f150f919261 100644
--- a/civicrm/vendor/composer/include_paths.php
+++ b/civicrm/vendor/composer/include_paths.php
@@ -11,11 +11,11 @@ return array(
$vendorDir . '/pear/auth_sasl',
$vendorDir . '/pear/console_getopt',
$vendorDir . '/pear/pear-core-minimal/src',
+ $vendorDir . '/pear/net_socket',
$vendorDir . '/pear/db',
$vendorDir . '/pear/log',
$vendorDir . '/pear/mail',
$vendorDir . '/pear/mail_mime',
- $vendorDir . '/pear/net_socket',
$vendorDir . '/pear/net_smtp',
$vendorDir . '/pear/validate_finance_creditcard',
);
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index c07aa1899dca397906a1bb851b1f2d7a81bd15b3..fc355bc382c0e43f3162b198c4a85c3bec36d85e 100644
--- a/civicrm/vendor/composer/installed.php
+++ b/civicrm/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'civicrm/civicrm-core',
'pretty_version' => '5.52.x-dev',
'version' => '5.52.9999999.9999999-dev',
- 'reference' => 'a9faea2c39a8c34f98a86f117df10cfafedfa560',
+ 'reference' => '5a183fd9f043bde7067a5fddbf681056094bf615',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -58,7 +58,7 @@
'civicrm/civicrm-core' => array(
'pretty_version' => '5.52.x-dev',
'version' => '5.52.9999999.9999999-dev',
- 'reference' => 'a9faea2c39a8c34f98a86f117df10cfafedfa560',
+ 'reference' => '5a183fd9f043bde7067a5fddbf681056094bf615',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index a1b080f4898cf1318d4c41abd4d5f1ed5c7994fe..56dc2f9165cf69c22c7ee9fb332ae4b5dfb27962 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.52.2</version_no>
+ <version_no>5.52.3</version_no>
</version>