diff --git a/civicrm.php b/civicrm.php
index 1bb74ecde86f3bdcaab1ca71fa8dd652c3e99b66..b9787f8b900150642afc2bbedcb6b18aa8d8429d 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.59.2
+ * Version: 5.59.3
* Requires at least: 4.9
* Requires PHP: 7.3
* 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.59.2');
+define('CIVICRM_PLUGIN_VERSION', '5.59.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 33309215f8d9e825269f9201f731c05f701a0023..cd81fe127c0462224ae05a27f2b37103b2196b3c 100644
--- a/civicrm/CRM/Contribute/Import/Parser/Contribution.php
+++ b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
@@ -440,7 +440,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
$softCreditParams = [];
foreach ($params['SoftCreditContact'] ?? [] as $index => $softCreditContact) {
$softCreditParams[$index]['soft_credit_type_id'] = $softCreditContact['soft_credit_type_id'];
- $softCreditParams[$index]['contact_id'] = $this->getContactID($softCreditContact['Contact'], $softCreditContact['Contact']['id'] ?? NULL, 'SoftCreditContact', $this->getDedupeRulesForEntity('SoftCreditContact'));
+ $softCreditParams[$index]['contact_id'] = $this->getContactID($softCreditContact['Contact'], !empty($softCreditContact['Contact']['id']) ? $softCreditContact['Contact']['id'] : NULL, 'SoftCreditContact', $this->getDedupeRulesForEntity('SoftCreditContact'));
if (empty($softCreditParams[$index]['contact_id']) && in_array($this->getActionForEntity('SoftCreditContact'), ['update', 'select'])) {
throw new CRM_Core_Exception(ts('Soft Credit Contact not found'));
}
diff --git a/civicrm/CRM/Dedupe/Merger.php b/civicrm/CRM/Dedupe/Merger.php
index e0f7be46008255bea5f2ef30c6b972b6c8c69c05..2c02b615e191bd93a575811e28f92b2e7c1a50b6 100644
--- a/civicrm/CRM/Dedupe/Merger.php
+++ b/civicrm/CRM/Dedupe/Merger.php
@@ -9,6 +9,7 @@
+--------------------------------------------------------------------+
*/
+use Civi\Api4\Contact;
use Civi\Api4\CustomGroup;
/**
@@ -685,7 +686,18 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
// This parameter causes blank fields to be be emptied out.
// We can probably remove.
$params['updateBlankLocInfo'] = TRUE;
+ if (empty($params['contact_type']) || ($params['contact_type'] === 'Organization' && empty($params['organization_name']))) {
+ // Ensuring this is set addresses https://lab.civicrm.org/dev/core/-/issues/4156
+ // but not that RM_Dedupe_MergerTest::testMergeWithEmployer covers this scenario
+ // so refactoring of this is safe.
+ $contact = Contact::get(FALSE)->addWhere('id', '=', $contactID)->addSelect('organization_name', 'contact_type')->execute()->first();
+ $params['contact_type'] = $contact['contact_type'];
+ if (empty($params['organization_name']) && $params['contact_type'] === 'Organization') {
+ $params['organization_name'] = $contact['organization_name'];
+ }
+ }
$data = self::formatProfileContactParams($params, $contactID);
+
CRM_Contact_BAO_Contact::create($data);
}
@@ -707,13 +719,12 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
int $contactID
) {
- $data = $contactDetails = [];
+ $data = ['contact_type' => $params['contact_type']];
// get the contact details (hier)
$details = CRM_Contact_BAO_Contact::getHierContactDetails($contactID, []);
$contactDetails = $details[$contactID];
- $data['contact_type'] = $contactDetails['contact_type'] ?? NULL;
$data['contact_sub_type'] = $contactDetails['contact_sub_type'] ?? NULL;
//fix contact sub type CRM-5125
@@ -993,10 +1004,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
}
}
- if (!isset($data['contact_type'])) {
- $data['contact_type'] = 'Individual';
- }
-
return $data;
}
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 3c7dedc2dbec74e46111befc729afbe75e5caa9b..b08926b6d46de96cbdb9bca51230bb0b2f1aa414 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.59.2',
+ return array( 'version' => '5.59.3',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 66e40fc1cc497ef05761e58b0079f3ac812712ca..4979591a570939649a418e595cdf10878b5f9eed 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.59.2</version>
+ <version>5.59.3</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 202cdef8ddc4eeba4b706dbe2f99ba58ee2ce51f..7baa13bdcb388fa5763ada860da82a0c0ac8aa7c 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.59.2</version>
+ <version>5.59.3</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 5b0ecc052066ff3dd4c38bcad6e30793f4dece22..fb592924c199af7497c9fd0336dccd3d9226aad4 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.59.2</version>
+ <version>5.59.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index afaa31a6c78a5d570b81d500cd19c9fd86440809..e3248cf419d58c9be1d21a5ceae14a23fc0977f3 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.59.2</version>
+ <version>5.59.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 59a7435423df69a0b19498b98ea74e645d1364e4..c900047955dbd33b11ea0090dd1f172d3d27a22b 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.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index e062bb4082694154df89f66b9cda1afb571fc3c4..634f5d155e4b0f4ec0909bc44e18dc150e4c52c5 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.59.2</version>
+ <version>5.59.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 87c46228cc95f0c312a5e726ab15dcdce1b301cc..b88e1be01af63b78a5a97352fb27d3edf5454e4d 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.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index 7976fbc1d1ca3833a065040f4c230296415a1fa3..f0de9fa3874cd6d042c5f6cae36eb92ebd96c26d 100644
--- a/civicrm/ext/civiimport/info.xml
+++ b/civicrm/ext/civiimport/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-08-11</releaseDate>
- <version>5.59.2</version>
+ <version>5.59.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index b84f07779f0ccd3add85eb35e55c4b3e482ddea9..d6b7352471bbe5f646d4583160d4308f09fc850a 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.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index a824e73ff5ae601ab40a224a941eeeecb6a365a5..1cec3c0ca31d1c9ff2a8574709e35e9fdcd8e9a5 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.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index 7e9c54b7718c07da5b8fc209cc5daef4dd5c4fe2..55b7e2fb5dfaffe4d45f6a1d02c1aa8732dcb0b0 100644
--- a/civicrm/ext/elavon/info.xml
+++ b/civicrm/ext/elavon/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-08-05</releaseDate>
- <version>5.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index e7f94c344bc3881f14cde74f3e2bf2cc3ce7e5aa..cbcfbfffcf5b8e9e199cc5e747fd15fe07abef84 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.59.2</version>
+ <version>5.59.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 4faf877624a070a7621570fab776d0a66d91b1c2..b2e3597b7814214c498dc37f188f5db74e1d1b61 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.59.2</version>
+ <version>5.59.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 194896c2a9fdb96f6e2a2d7fa76dfe34a741b2a8..f7aa50b2a83ee062e5b1b0c67ea729f8cb139235 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.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 7d57a0f2b6b3ae934b3efde1ec7cc5b99929b3fc..f3c8a564f2beacbff42290288ecfa60926c65a66 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.59.2</version>
+ <version>5.59.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 9974900d551b131acc87a296b3f9f77adf4c2ab4..a1c8efd52b26d11cab55450ad386129e116fbef1 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.59.2</version>
+ <version>5.59.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index d5ede672587766edc9829ba679e0b142a2a69958..0b63aa514f4ef27df4df573df2c1058023a13338 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.59.2</version>
+ <version>5.59.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 ebe506e20618688ceebccab6cfd4c34ab2118494..6cbd34f5794ae7946dd74275c6c4828f94786d5f 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.59.2</version>
+ <version>5.59.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index fca5761a5f6c2d012350d7f53e0cb4ae196ac08e..62afa975ce0f9bb4a9d8c71f76574937e8b53149 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.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 3d8bee3cc35300ed2e5892ce74acfe44898c0d5d..b505fe1948634e995bdfd11e5e24eea2e6f09628 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.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.59</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index bcff953adea87ba8343b274597174e4cb3ee847a..87b8b910cf9623b5b67f97f461d3e4a063490e92 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.59.2</version>
+ <version>5.59.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 450a59bac9549fc57f24e8587ad8e01765c33bf4..100768b71ba461edce30b536c0421e39f4fe5b2f 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.59.2</version>
+ <version>5.59.3</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 78e7761528ee391958771d4cfbc1ff9e07d4263e..87067952f1ea4d3fd6b0ec60be3dedb18a41a18b 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.59.2</version>
+ <version>5.59.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index d11abec90a912ff380e09957a4de9f780a9ff85b..f0703c8e4c531b87f25fdf16cfa936e6a69b37cd 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.59.3
+
+Released March 15, 2023
+
+- **[Synopsis](release-notes/5.59.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.59.3.md#bugs)**
+- **[Credits](release-notes/5.59.3.md#credits)**
+- **[Feedback](release-notes/5.59.3.md#feedback)**
+
## CiviCRM 5.59.2
Released March 10, 2023
diff --git a/civicrm/release-notes/5.59.3.md b/civicrm/release-notes/5.59.3.md
new file mode 100644
index 0000000000000000000000000000000000000000..ccb3b0de0498ff511d538f3a791d72f11e6c0c8c
--- /dev/null
+++ b/civicrm/release-notes/5.59.3.md
@@ -0,0 +1,38 @@
+# CiviCRM 5.59.3
+
+Released March 15, 2023
+
+- **[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** |
+| Fix security vulnerabilities? | no |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_Import_: Contribution import fails on empty soft credit ([dev/core#4166](https://lab.civicrm.org/dev/core/-/issues/4166): [#25806](https://github.com/civicrm/civicrm-core/pull/25806))**
+* **_Dedupe_: Employer name becomes stale after merging organizations (partial fix) ([dev/core#4156](https://lab.civicrm.org/dev/core/-/issues/4156): [#25778](https://github.com/civicrm/civicrm-core/pull/25778))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; lkuttner; Coop SymbioTIC - Mathieu Lutfy;
+CiviCRM - Tim Otten; CiviCoop - Erik Hommel; Agileware - Justin Freeman
+
+## <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 6d047af03951b352ba76283ccf81eed26c9c70a2..88867fe8178247e2cb23a34aa81424a280b7d512 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23678,4 +23678,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.59.2';
+UPDATE civicrm_domain SET version = '5.59.3';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 1eeebc0997571a9d48d1b7742e593e5e5f14f404..0858513092d129e31e0f36b0e82c57d4a159a02c 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -3055,7 +3055,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.59.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.59.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 132cd863d47414a80f74fa6cd6191bd30f703ce1..c5905e4e4bef2c25f3fa9e15253a50ab59732337 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInited68f23263a1c03a76a0a11e41947a82::getLoader();
+return ComposerAutoloaderInit5b9fa8178f0547c9453906e5e95835fb::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 7e552e91636a35782cb187a73e6a9261c95ead26..5fa4f9c48083a7ac027e0923b91a58b75322dc15 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 ComposerAutoloaderInited68f23263a1c03a76a0a11e41947a82
+class ComposerAutoloaderInit5b9fa8178f0547c9453906e5e95835fb
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInited68f23263a1c03a76a0a11e41947a82
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInited68f23263a1c03a76a0a11e41947a82', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit5b9fa8178f0547c9453906e5e95835fb', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInited68f23263a1c03a76a0a11e41947a82', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit5b9fa8178f0547c9453906e5e95835fb', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInited68f23263a1c03a76a0a11e41947a82
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInited68f23263a1c03a76a0a11e41947a82::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit5b9fa8178f0547c9453906e5e95835fb::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInited68f23263a1c03a76a0a11e41947a82
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInited68f23263a1c03a76a0a11e41947a82::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit5b9fa8178f0547c9453906e5e95835fb::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequireed68f23263a1c03a76a0a11e41947a82($fileIdentifier, $file);
+ composerRequire5b9fa8178f0547c9453906e5e95835fb($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInited68f23263a1c03a76a0a11e41947a82
* @param string $file
* @return void
*/
-function composerRequireed68f23263a1c03a76a0a11e41947a82($fileIdentifier, $file)
+function composerRequire5b9fa8178f0547c9453906e5e95835fb($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 ac869d4a591561cc6fedcbdfee64463eefb80995..1663548a41e0b3c0339fcac7dd847dbc87546903 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInited68f23263a1c03a76a0a11e41947a82
+class ComposerStaticInit5b9fa8178f0547c9453906e5e95835fb
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -744,11 +744,11 @@ class ComposerStaticInited68f23263a1c03a76a0a11e41947a82
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInited68f23263a1c03a76a0a11e41947a82::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInited68f23263a1c03a76a0a11e41947a82::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInited68f23263a1c03a76a0a11e41947a82::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInited68f23263a1c03a76a0a11e41947a82::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInited68f23263a1c03a76a0a11e41947a82::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit5b9fa8178f0547c9453906e5e95835fb::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit5b9fa8178f0547c9453906e5e95835fb::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit5b9fa8178f0547c9453906e5e95835fb::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit5b9fa8178f0547c9453906e5e95835fb::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit5b9fa8178f0547c9453906e5e95835fb::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index 39bd2b9ebde3ddc5d97923ae963e27becc934bf8..c981e51d1c538c8041ec9eec5b4e545f9687a790 100644
--- a/civicrm/vendor/composer/installed.php
+++ b/civicrm/vendor/composer/installed.php
@@ -5,7 +5,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '296d9bc9f06a794542187e8618350a0b69d99039',
+ 'reference' => 'a470f36404babb775566c3ace40a84f8b05be44e',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -61,7 +61,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '296d9bc9f06a794542187e8618350a0b69d99039',
+ 'reference' => 'a470f36404babb775566c3ace40a84f8b05be44e',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index f2be351770dae1ff9eadce1cec86594ef16f890d..353b88311691883b9c7e60a1a5d2bf3260e5fe7d 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.59.2</version_no>
+ <version_no>5.59.3</version_no>
</version>