diff --git a/civicrm.php b/civicrm.php
index f0c078956b208860933a483148b5739831006af2..cd768d1bde1e2a5ed93c61f5fa84fbcac84890a4 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.69.1
+ * Version: 5.69.2
* 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.69.1');
+define('CIVICRM_PLUGIN_VERSION', '5.69.2');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Admin/Page/Mapping.php b/civicrm/CRM/Admin/Page/Mapping.php
index eb3e596e36a31aadb4e5cefe89879f52f9a96b5a..f979b35ea06c537cb50e69ff736851719a2d1e69 100644
--- a/civicrm/CRM/Admin/Page/Mapping.php
+++ b/civicrm/CRM/Admin/Page/Mapping.php
@@ -55,12 +55,14 @@ class CRM_Admin_Page_Mapping extends CRM_Core_Page_Basic {
'url' => 'civicrm/admin/mapping',
'qs' => 'action=update&id=%%id%%&reset=1',
'title' => ts('Edit Mapping'),
+ 'weight' => CRM_Core_Action::getWeight(CRM_Core_Action::UPDATE),
],
CRM_Core_Action::DELETE => [
'name' => ts('Delete'),
'url' => 'civicrm/admin/mapping',
'qs' => 'action=delete&id=%%id%%',
'title' => ts('Delete Mapping'),
+ 'weight' => CRM_Core_Action::getWeight(CRM_Core_Action::DELETE),
],
];
}
diff --git a/civicrm/CRM/Contact/Selector.php b/civicrm/CRM/Contact/Selector.php
index b4f0fd2a0a1275f97cd1de377e68eeb5b88e77dd..f039446dcce317b0675148fc8e1ba1ec8bee1039 100644
--- a/civicrm/CRM/Contact/Selector.php
+++ b/civicrm/CRM/Contact/Selector.php
@@ -969,6 +969,7 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
'url' => 'civicrm/contact/view/delete',
'qs' => 'reset=1&cid=%%id%%&restore=1',
'title' => ts('Restore Contact'),
+ 'weight' => 80,
],
];
if (CRM_Core_Permission::check('delete contacts')) {
diff --git a/civicrm/CRM/Event/Form/Registration.php b/civicrm/CRM/Event/Form/Registration.php
index f94dd144d537483906e1ee81a3fe774201549da2..1b199760d332f1daba2cd9a6ec19cc6f16a4eb27 100644
--- a/civicrm/CRM/Event/Form/Registration.php
+++ b/civicrm/CRM/Event/Form/Registration.php
@@ -1591,7 +1591,7 @@ class CRM_Event_Form_Registration extends CRM_Core_Form {
$this->set('participantInfo', $this->_participantInfo);
}
- if ($this->getPaymentProcessorObject()->supports('noReturn')
+ if (!$this->getEventValue('is_monetary') || $this->getPaymentProcessorObject()->supports('noReturn')
) {
// Send mail Confirmation/Receipt.
$this->sendMails($params, $registerByID, $participantCount);
diff --git a/civicrm/CRM/Import/Form/MapField.php b/civicrm/CRM/Import/Form/MapField.php
index 2c8785d424461672142083ee4dca747f57fd05b7..2eda66a1cec2e8ea33bb165a573d81cd675cdac4 100644
--- a/civicrm/CRM/Import/Form/MapField.php
+++ b/civicrm/CRM/Import/Form/MapField.php
@@ -511,4 +511,51 @@ abstract class CRM_Import_Form_MapField extends CRM_Import_Forms {
return $this->defaultFromHeader($columnHeader, $headerPatterns);
}
+ /**
+ * Get default values for the mapping.
+ *
+ * @return array
+ *
+ * @throws \CRM_Core_Exception
+ */
+ protected function getDefaults(): array {
+ $defaults = $mappingFailures = [];
+ $headerPatterns = $this->getHeaderPatterns();
+ $fieldMappings = $this->getFieldMappings();
+ foreach ($this->getColumnHeaders() as $i => $columnHeader) {
+ if ($this->getSubmittedValue('savedMapping')) {
+ $fieldMapping = $fieldMappings[$i] ?? NULL;
+ if (isset($fieldMappings[$i])) {
+ if (($fieldMapping['name'] === 'do_not_import')) {
+ $defaults["mapper[$i]"] = NULL;
+ }
+ elseif (array_key_exists($fieldMapping['name'], $this->getAvailableFields())) {
+ $defaults["mapper[$i]"] = $fieldMapping['name'];
+ }
+ else {
+ // The field from the saved mapping does not map to an available field.
+ // This could be because of an old, not-upgraded mapping or
+ // something we have failed to anticipate.
+ // In this case we should let the user know, but not
+ // set the default to the invalid field.
+ // See https://lab.civicrm.org/dev/core/-/issues/4781
+ // Note that we have made attempts (e.g 5.51) to upgrade mappings and
+ // there is code to remove a mapping if a custom field is deleted
+ // (but perhaps not disabled or acl-restricted) but we should also
+ // handle it here rather than rely on our other efforts.
+ $mappingFailures[] = $columnHeader;
+ $defaults["mapper[$i]"] = NULL;
+ }
+ }
+ }
+ if (!isset($defaults["mapper[$i]"]) && $this->getSubmittedValue('skipColumnHeader')) {
+ $defaults["mapper[$i]"] = $this->defaultFromHeader($columnHeader, $headerPatterns);
+ }
+ }
+ if (!$this->isSubmitted() && $mappingFailures) {
+ CRM_Core_Session::setStatus(ts('Unable to load saved mapping. Please ensure all fields are correctly mapped'));
+ }
+ return $defaults;
+ }
+
}
diff --git a/civicrm/CRM/Import/Parser.php b/civicrm/CRM/Import/Parser.php
index 7d327675e0a83ad6e5de1b0e84893400de8a09cd..6841837be3815f7ddb7260ef5f7311cf9f6d8739 100644
--- a/civicrm/CRM/Import/Parser.php
+++ b/civicrm/CRM/Import/Parser.php
@@ -1128,11 +1128,6 @@ abstract class CRM_Import_Parser implements UserJobInterface {
// get the formatted location blocks into params - w/ 3.0 format, CRM-4605
if (!empty($values['location_type_id'])) {
- static $fields = NULL;
- if ($fields == NULL) {
- $fields = [];
- }
-
foreach (['Phone', 'Email', 'IM', 'OpenID', 'Phone_Ext'] as $block) {
$name = strtolower($block);
if (!array_key_exists($name, $values)) {
diff --git a/civicrm/CRM/Mailing/Event/BAO/MailingEventForward.php b/civicrm/CRM/Mailing/Event/BAO/MailingEventForward.php
index ad4fd2bcd2115b1a81c6ac0b048766efa31f7f78..0b29b6a08b7daa735b12c88e3d7fa073e1135116 100644
--- a/civicrm/CRM/Mailing/Event/BAO/MailingEventForward.php
+++ b/civicrm/CRM/Mailing/Event/BAO/MailingEventForward.php
@@ -233,11 +233,6 @@ class CRM_Mailing_Event_BAO_MailingEventForward extends CRM_Mailing_Event_DAO_Ma
// get the formatted location blocks into params - w/ 3.0 format, CRM-4605
if (!empty($values['location_type_id'])) {
- static $fields = NULL;
- if ($fields == NULL) {
- $fields = [];
- }
-
foreach (['Phone', 'Email', 'IM', 'OpenID', 'Phone_Ext'] as $block) {
$name = strtolower($block);
if (!array_key_exists($name, $values)) {
diff --git a/civicrm/CRM/Member/Form/Membership.php b/civicrm/CRM/Member/Form/Membership.php
index 4c7e4b658dd8ca14f5bbd503ae5adf3992d876a0..db84d567694df9ec52067190ec1d33cd0c1df741 100644
--- a/civicrm/CRM/Member/Form/Membership.php
+++ b/civicrm/CRM/Member/Form/Membership.php
@@ -427,7 +427,7 @@ DESC limit 1");
$selOrgMemType[$memberOfContactId][$key] = $values['name'] ?? NULL;
}
}
- $totalAmount = $values['minimum_fee'] ?? NULL;
+ $totalAmount = $values['minimum_fee'] ?? 0;
// build membership info array, which is used when membership type is selected to:
// - set the payment information block
// - set the max related block
diff --git a/civicrm/CRM/Member/Import/Form/MapField.php b/civicrm/CRM/Member/Import/Form/MapField.php
index 8d04b84bcf02d8853c841409faf02d489d7a6519..ba9ff733c0681e52d8ee49f5da55eeed8dc9f18d 100644
--- a/civicrm/CRM/Member/Import/Form/MapField.php
+++ b/civicrm/CRM/Member/Import/Form/MapField.php
@@ -177,29 +177,4 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField {
return $highlightedFields;
}
- /**
- * Get default values for the mapping.
- *
- * @return array
- *
- * @throws \CRM_Core_Exception
- */
- protected function getDefaults(): array {
- $defaults = [];
- $headerPatterns = $this->getHeaderPatterns();
- $fieldMappings = $this->getFieldMappings();
- foreach ($this->getColumnHeaders() as $i => $columnHeader) {
- if ($this->getSubmittedValue('savedMapping')) {
- $fieldMapping = $fieldMappings[$i] ?? NULL;
- if (isset($fieldMappings[$i])) {
- $defaults["mapper[$i]"] = ($fieldMapping['name'] !== 'do_not_import') ? $fieldMapping['name'] : NULL;
- }
- }
- if (!isset($defaults["mapper[$i]"]) && $this->getSubmittedValue('skipColumnHeader')) {
- $defaults["mapper[$i]"] = $this->defaultFromHeader($columnHeader, $headerPatterns);
- }
- }
- return $defaults;
- }
-
}
diff --git a/civicrm/CRM/Profile/Form.php b/civicrm/CRM/Profile/Form.php
index 32cea9291c32005cb44dd8d09c3005264054faeb..e9c8e4f80b45ea15765506d3734aeb18d63f3ba2 100644
--- a/civicrm/CRM/Profile/Form.php
+++ b/civicrm/CRM/Profile/Form.php
@@ -886,10 +886,10 @@ class CRM_Profile_Form extends CRM_Core_Form {
$this->setDefaultsValues();
$action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, NULL);
+ $this->assign('showCMS', FALSE);
if ($this->_mode == self::MODE_CREATE || $this->_mode == self::MODE_EDIT) {
CRM_Core_BAO_CMSUser::buildForm($this, $this->_gid, $emailPresent, $action);
}
- $this->assign('showCMS', FALSE);
$this->assign('groupId', $this->_gid);
diff --git a/civicrm/Civi/Test/FormTrait.php b/civicrm/Civi/Test/FormTrait.php
index 757085ae1b022e4616946cdc5578d0dd760289ae..4d49641af23ff0173f68969d3dd1bfd23159dc65 100644
--- a/civicrm/Civi/Test/FormTrait.php
+++ b/civicrm/Civi/Test/FormTrait.php
@@ -76,6 +76,9 @@ trait FormTrait {
* @param int $mailIndex
*/
protected function assertMailSentContainingString(string $string, int $mailIndex = 0): void {
+ if (!$this->form->getMail()) {
+ $this->fail('No mail sent');
+ }
$mail = $this->form->getMail()[$mailIndex];
$this->assertStringContainsString(preg_replace('/\s+/', '', $string), preg_replace('/\s+/', '', $mail['body']), 'String not found: ' . $string . "\n" . $mail['body']);
}
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 57a26b3dfeacd9f0e395c0c6ff4087e473e601f4..803b1543824ef159c51c65fed22f587d4e313694 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.69.1',
+ return array( 'version' => '5.69.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 4c0abe0b8cd3eaa1055e272578b2b457ac429c0e..fd44926b3d3e2796cf86c651a1cef97bf9e71b37 100644
--- a/civicrm/ext/afform/admin/info.xml
+++ b/civicrm/ext/afform/admin/info.xml
@@ -12,8 +12,8 @@
<url desc="Chat">https://chat.civicrm.org/civicrm/channels/dev-afform</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 7d3662c4a10d58a1d9713be84b3f676f5644e70f..5a8c0e747b0b3df93934c9ad59275e8b692dcffb 100644
--- a/civicrm/ext/afform/core/info.xml
+++ b/civicrm/ext/afform/core/info.xml
@@ -12,8 +12,8 @@
<url desc="Chat">https://chat.civicrm.org/civicrm/channels/dev-afform</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<compatibility>
<ver>5.69</ver>
</compatibility>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 26fe7182e2ba1174b041c197a9c1df7811a96d65..3c4f105ab2556a40345362073ab19821cab73944 100644
--- a/civicrm/ext/afform/html/info.xml
+++ b/civicrm/ext/afform/html/info.xml
@@ -12,8 +12,8 @@
<url desc="Chat">https://chat.civicrm.org/civicrm/channels/dev-afform</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index e42dc01d2ff9f595d713c952d19d1879cdbda262..ac698c472776828a547c072ef481d9f1119a73a7 100644
--- a/civicrm/ext/afform/mock/info.xml
+++ b/civicrm/ext/afform/mock/info.xml
@@ -11,8 +11,8 @@
<urls>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index a2a69c0d25b91945c8b6fff50736b6dbc37e8386..921c9e6f18348e49d5f6dc851686d7561a052675 100644
--- a/civicrm/ext/authx/info.xml
+++ b/civicrm/ext/authx/info.xml
@@ -14,8 +14,8 @@
<url desc="Issues">https://lab.civicrm.org/dev/core/-/issues</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/civi_campaign/info.xml b/civicrm/ext/civi_campaign/info.xml
index aef6f9a0d99cd0af699a089f4c76cc0fbcc9a65e..a8a9372e666a1b6a7b6a610a9beaeb0e01d3a8d5 100644
--- a/civicrm/ext/civi_campaign/info.xml
+++ b/civicrm/ext/civi_campaign/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/campaign/what-is-civicampaign/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_case/info.xml b/civicrm/ext/civi_case/info.xml
index 83b723929afa659894d1b6b670e1971fd6f43b60..e0fd52eb2d4817c1953198fe3f8ecbd20faa799f 100644
--- a/civicrm/ext/civi_case/info.xml
+++ b/civicrm/ext/civi_case/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/case-management/what-is-civicase/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_contribute/info.xml b/civicrm/ext/civi_contribute/info.xml
index 743a2534354d0625c5ac4c30d3e6b28b5a6023e4..3f201436df311540e38a9d4b3fffe1e6014e7a2c 100644
--- a/civicrm/ext/civi_contribute/info.xml
+++ b/civicrm/ext/civi_contribute/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/contributions/what-is-civicontribute/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_event/info.xml b/civicrm/ext/civi_event/info.xml
index 98e614bd07684ea0b17aebb66d30b5e2afd7ad2d..7185d36e42baed763e7091b20958b575126229da 100644
--- a/civicrm/ext/civi_event/info.xml
+++ b/civicrm/ext/civi_event/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/events/what-is-civievent</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_mail/info.xml b/civicrm/ext/civi_mail/info.xml
index 9d9f895ca08c2f1474d6cfef300f91fb3e2bc2ac..e03fb4c40aa7acd24a67127ce1a685dda81674cb 100644
--- a/civicrm/ext/civi_mail/info.xml
+++ b/civicrm/ext/civi_mail/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/email/what-is-civimail/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_member/info.xml b/civicrm/ext/civi_member/info.xml
index 2142a180c57aac72bb5af2f238694ca3d3403d93..1f78fd8167296988af3afd12763e3d41bc6ee97a 100644
--- a/civicrm/ext/civi_member/info.xml
+++ b/civicrm/ext/civi_member/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/membership/what-is-civimember/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_pledge/info.xml b/civicrm/ext/civi_pledge/info.xml
index 614384068e850c5b4718a345b8137dd1e8106242..a8ab9b1279b68260867d7e3e2fdad6c0f50f588a 100644
--- a/civicrm/ext/civi_pledge/info.xml
+++ b/civicrm/ext/civi_pledge/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/pledges/what-is-civipledge/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civi_report/info.xml b/civicrm/ext/civi_report/info.xml
index a2fc382d971ed7248ebf1c50b43060000ea8055d..e42793d098ff00b934e5affeaed22395348199b6 100644
--- a/civicrm/ext/civi_report/info.xml
+++ b/civicrm/ext/civi_report/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/reporting/what-is-civireport/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>component</tag>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index 35a2ca57970cc16648f0ea42a4ee5bb221821ebe..42da1f2468fb61cd561322a6a1e59f03fa1f1663 100644
--- a/civicrm/ext/civicrm_admin_ui/info.xml
+++ b/civicrm/ext/civicrm_admin_ui/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://lab.civicrm.org/dev/core/-/issues</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/civicrm_search_ui/info.xml b/civicrm/ext/civicrm_search_ui/info.xml
index baecc9b7c3d01f97ba9e70514847f0e8cfa3474f..55908928e790e9a66eef8aee663dc2abd8962153 100644
--- a/civicrm/ext/civicrm_search_ui/info.xml
+++ b/civicrm/ext/civicrm_search_ui/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://lab.civicrm.org/dev/core/-/issues</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>alpha</develStage>
<requires>
<ext>org.civicrm.search_kit</ext>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 46a3c29390580c8aa62f0e74087b6f0d14852f07..a8a22d1c3788825a5c1238e01beb721a59b72ce5 100644
--- a/civicrm/ext/civigrant/info.xml
+++ b/civicrm/ext/civigrant/info.xml
@@ -12,8 +12,8 @@
<url desc="Documentation">https://docs.civicrm.org/user/en/latest/grants/what-is-civigrant/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index 5316651260e487a14de6fda12cd2b5c2076dc33d..af06112910f8467985284650c5b3056189e41037 100644
--- a/civicrm/ext/civiimport/info.xml
+++ b/civicrm/ext/civiimport/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://civicrm.org</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 737e59c0ba061f8f6091e5cf0acb42e2e4c6078a..e619949d1c62214f04d1bd89197420e15e3d5dcb 100644
--- a/civicrm/ext/ckeditor4/info.xml
+++ b/civicrm/ext/ckeditor4/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://github.com/civicrm/civicrm-core/</url>
<url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 735e1a79f04be012cba29049dd3906b4dca0a9a1..675f8d2c67b6e6a4a4b93417c2d286087926c530 100644
--- a/civicrm/ext/contributioncancelactions/info.xml
+++ b/civicrm/ext/contributioncancelactions/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://civicrm.org</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index 163058e1b3c93d88751ca650a2d5334d93594427..bd9b0fdddc6e865d832aba2ac628832dd1e344a4 100644
--- a/civicrm/ext/elavon/info.xml
+++ b/civicrm/ext/elavon/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://lab.civicrm.org</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 06dd8908d82db0647864d7162ba85fa044bcea44..381bb5b05dad042ee979e8b052fa969bb613d165 100644
--- a/civicrm/ext/eventcart/info.xml
+++ b/civicrm/ext/eventcart/info.xml
@@ -12,8 +12,8 @@
<url desc="Main Extension Page">https://github.com/civicrm/civicrm-core/tree/master/ext/eventcart</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index be07abf0c184f830214c94b7154b592a0ffe6395..2d2bf431b60d44359a63d98e4819e3a628330478 100644
--- a/civicrm/ext/ewaysingle/info.xml
+++ b/civicrm/ext/ewaysingle/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://github.com/civicrm/civicrm-core/blob/master/ext/ewaysingle</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 0ed62da489cb7a50b918ee7248c462eb35d8da8c..3dc506da21354be7776d7124cb838e0d9b555976 100644
--- a/civicrm/ext/financialacls/info.xml
+++ b/civicrm/ext/financialacls/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://FIXME</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 7cafe1e2d2d208780bc38dbeef9e1eda747627fd..1fc9314c69ade4b561566fe400fbfea28736666c 100644
--- a/civicrm/ext/flexmailer/info.xml
+++ b/civicrm/ext/flexmailer/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://civicrm.stackexchange.com/</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</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 bc92fd1bc4aae441ad5fe8c1c260a55b322c2856..475525e8ec0966e27689bdf4cbf7be407ccac828 100644
--- a/civicrm/ext/greenwich/info.xml
+++ b/civicrm/ext/greenwich/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://civicrm.org</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index c32fd2de35539b44a74c8025dde31959475eab11..7ff4a1d888880d5e4317f72c9bca212d0fdb8ac8 100644
--- a/civicrm/ext/legacycustomsearches/info.xml
+++ b/civicrm/ext/legacycustomsearches/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://FIXME</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml
index 3d1e3f74597fa6898f981b8804aee87e19801aa5..f72d3766cfa1a73962e6e7b4f94eceb3111557df 100644
--- a/civicrm/ext/message_admin/info.xml
+++ b/civicrm/ext/message_admin/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://civicrm.org</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index 592b5caa9be0ad5250dcc9b22b5a5d4ffca718e7..22c8170196ba5f3220a5fbbef233419e6766ce7c 100644
--- a/civicrm/ext/oauth-client/info.xml
+++ b/civicrm/ext/oauth-client/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://lab.civicrm.org/dev/core/-/issues</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 07a70dcefb1170acfface4eff56cb0a8711d4053..d49749d23b14e22c2d1b1f8c1fa923190474bd6a 100644
--- a/civicrm/ext/payflowpro/info.xml
+++ b/civicrm/ext/payflowpro/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://lab.civicrm.org</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index b56c8e0ff70e77eff705e4410a824528ff9e83c8..9d82903a1e35008f205c8cfc4139a079856db941 100644
--- a/civicrm/ext/recaptcha/info.xml
+++ b/civicrm/ext/recaptcha/info.xml
@@ -12,8 +12,8 @@
<url desc="Main Extension Page">https://github.com/civicrm/civicrm-core/tree/master/ext/recaptcha</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/scheduled_communications/info.xml b/civicrm/ext/scheduled_communications/info.xml
index 8b4e2ad4d91243b89ebc1d2abf62af25172f7e6f..7750124795ce5c74c7ef33fe869485189f55a01f 100644
--- a/civicrm/ext/scheduled_communications/info.xml
+++ b/civicrm/ext/scheduled_communications/info.xml
@@ -12,8 +12,8 @@
<url desc="Chat">https://chat.civicrm.org/civicrm/channels/search-improvements</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
index 75982ddf83fbceaade81e6e69f7fea73216f63d2..f040724ba0424da1b4ce311c650ed3c9dce3b568 100644
--- a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
+++ b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -651,7 +651,7 @@ abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
return \CRM_Core_Permission::check($permissions) == ($op !== '!=');
}
// Convert the conditional value of 'current_domain' into an actual value that filterCompare can work with
- if ($item['condition'][2] ?? '' === 'current_domain') {
+ if (($item['condition'][2] ?? '') === 'current_domain') {
if (str_ends_with($item['condition'][0], ':label') !== FALSE) {
$item['condition'][2] = \CRM_Core_BAO_Domain::getDomain()->name;
}
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 4f98e1459ffc67cc8c45d664acd5fb5e62feaeaa..f9071bcb4011a5eb3a6dd6adcc51b80907af9e25 100644
--- a/civicrm/ext/search_kit/info.xml
+++ b/civicrm/ext/search_kit/info.xml
@@ -14,8 +14,8 @@
<url desc="Issues">https://lab.civicrm.org/dev/report/-/issues</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 3252f01317c771fb11dbefabe698723eacb424db..c1abec7e72e0d33fcfad57f97943579da8b13864 100644
--- a/civicrm/ext/sequentialcreditnotes/info.xml
+++ b/civicrm/ext/sequentialcreditnotes/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://lab.civicrm.org/extensions/sequentialcreditnotes</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/standaloneusers/info.xml b/civicrm/ext/standaloneusers/info.xml
index 9f18e204085a6b3b692f364f142064f19def64f9..03439363c63d5ad0511e2d4783d0febf922ab0eb 100644
--- a/civicrm/ext/standaloneusers/info.xml
+++ b/civicrm/ext/standaloneusers/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://FIXME</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/ext/user_dashboard/info.xml b/civicrm/ext/user_dashboard/info.xml
index 82502deb640c104a6b20648edbd6fc9b2527f04c..c587ec60566fbec314dac7854125196fc4c633f7 100644
--- a/civicrm/ext/user_dashboard/info.xml
+++ b/civicrm/ext/user_dashboard/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">http://FIXME</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2024-01-05</releaseDate>
- <version>5.69.1</version>
+ <releaseDate>2024-01-11</releaseDate>
+ <version>5.69.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.69</ver>
diff --git a/civicrm/js/version.json b/civicrm/js/version.json
index dc09c990c3dbebe7b9ddf9a40798b450753f2396..01750314f6d7e14f167dc4328b77add48ee53d9a 100644
--- a/civicrm/js/version.json
+++ b/civicrm/js/version.json
@@ -1 +1 @@
-"5.69.1"
+"5.69.2"
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 0fa4e23d299a27f2039e2b7d0562baad4791a0f7..7729a3d403c962eb622a84736689ec24c976d78d 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.69.2
+
+Released January 11, 2024
+
+- **[Synopsis](release-notes/5.69.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.69.2.md#bugs)**
+- **[Credits](release-notes/5.69.2.md#credits)**
+- **[Feedback](release-notes/5.69.2.md#feedback)**
+
## CiviCRM 5.69.1
Released January 5, 2024
diff --git a/civicrm/release-notes/5.69.2.md b/civicrm/release-notes/5.69.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..b32c48c1dba4e1274d62f57524c12a128d04ee0f
--- /dev/null
+++ b/civicrm/release-notes/5.69.2.md
@@ -0,0 +1,44 @@
+# CiviCRM 5.69.2
+
+Released January 11, 2024
+
+- **[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
+
+* **_CiviEvent_: Fix confirmation email for certain event-registrations ([dev/core#4893](https://lab.civicrm.org/dev/core/-/issues/4893): [#28928](https://github.com/civicrm/civicrm-core/pull/28928))**
+* **_Import_: "Saved Mappings" with deprecated fields should fail gracefully ([dev/core#4781](https://lab.civicrm.org/dev/core/-/issues/4781): [#28933](https://github.com/civicrm/civicrm-core/pull/28933))**
+* **_Link Weights_: Fix recent warnings about hyperlink weights involving "Import Mappings" and "Search in Trash" ([dev/core#4891](https://lab.civicrm.org/dev/core/-/issues/4891), [dev/core#4892](https://lab.civicrm.org/dev/core/-/issues/4892): [#28931](https://github.com/civicrm/civicrm-core/pull/28931))**
+* **_Profile_: Fix creation of new user accounts ([#28970](https://github.com/civicrm/civicrm-core/pull/28970))**
+* **_PHP 8.3_: Fix parse errors on "Importer" and "Forward email" ([dev/core#4879](https://lab.civicrm.org/dev/core/-/issues/4879): [#28838](https://github.com/civicrm/civicrm-core/pull/28838))**
+* **_Search Kit_: Conditional links sometimes display incorrectly ([dev/core#4897](https://lab.civicrm.org/dev/core/-/issues/4897): [#28944](https://github.com/civicrm/civicrm-core/pull/28944))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Systopia - Johannes; Stephen Palmstrom; JMA
+Consulting - Seamus Lee; Dave D; CiviDesk - Yashodha Chaku; CiviCRM - Tim Otten, Coleman
+Watts; Circle Interactive - Pradeep Nayak; Bob Silvern; Benjamin W; 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 021cdb9da071ee9299f2a1e8a815263745cc7bfc..4c73ac30404b346f4216a0058db4aeaae85542ed 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -21703,4 +21703,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.69.1';
+UPDATE civicrm_domain SET version = '5.69.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index fa50a1ee5d2a1c80daa50174e9a5a2a0d39e8ee4..a70d269fee746751cb78163534b09b09bdbea27a 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2976,7 +2976,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.69.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.69.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 5f96ae292b15bc69c64e17364a1e47cbd489ffbb..7d254f595fe08ab1f7fc8a2d3e314d152e498098 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 ComposerAutoloaderInitd5bdefcb63e0870eb95622af3de75945::getLoader();
+return ComposerAutoloaderInit0fcbe1ec640ae9fe693b02538241f085::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index f516095ffd36291f5e56f65a21ed12cd0c5d34bc..9109da896636f5ea1516f649edae2fdf4f964a61 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 ComposerAutoloaderInitd5bdefcb63e0870eb95622af3de75945
+class ComposerAutoloaderInit0fcbe1ec640ae9fe693b02538241f085
{
private static $loader;
@@ -24,22 +24,22 @@ class ComposerAutoloaderInitd5bdefcb63e0870eb95622af3de75945
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInitd5bdefcb63e0870eb95622af3de75945', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit0fcbe1ec640ae9fe693b02538241f085', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
- spl_autoload_unregister(array('ComposerAutoloaderInitd5bdefcb63e0870eb95622af3de75945', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit0fcbe1ec640ae9fe693b02538241f085', '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\ComposerStaticInitd5bdefcb63e0870eb95622af3de75945::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit0fcbe1ec640ae9fe693b02538241f085::getInitializer($loader));
$loader->register(true);
- $includeFiles = \Composer\Autoload\ComposerStaticInitd5bdefcb63e0870eb95622af3de75945::$files;
+ $includeFiles = \Composer\Autoload\ComposerStaticInit0fcbe1ec640ae9fe693b02538241f085::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequired5bdefcb63e0870eb95622af3de75945($fileIdentifier, $file);
+ composerRequire0fcbe1ec640ae9fe693b02538241f085($fileIdentifier, $file);
}
return $loader;
@@ -51,7 +51,7 @@ class ComposerAutoloaderInitd5bdefcb63e0870eb95622af3de75945
* @param string $file
* @return void
*/
-function composerRequired5bdefcb63e0870eb95622af3de75945($fileIdentifier, $file)
+function composerRequire0fcbe1ec640ae9fe693b02538241f085($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 ec5692b941675693dc94ba94dcbb5234b3d88ed2..6c7aa78c9fcfd983bf37f9abf8b60da9c184e902 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitd5bdefcb63e0870eb95622af3de75945
+class ComposerStaticInit0fcbe1ec640ae9fe693b02538241f085
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -713,11 +713,11 @@ class ComposerStaticInitd5bdefcb63e0870eb95622af3de75945
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitd5bdefcb63e0870eb95622af3de75945::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitd5bdefcb63e0870eb95622af3de75945::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitd5bdefcb63e0870eb95622af3de75945::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInitd5bdefcb63e0870eb95622af3de75945::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInitd5bdefcb63e0870eb95622af3de75945::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit0fcbe1ec640ae9fe693b02538241f085::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit0fcbe1ec640ae9fe693b02538241f085::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit0fcbe1ec640ae9fe693b02538241f085::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit0fcbe1ec640ae9fe693b02538241f085::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit0fcbe1ec640ae9fe693b02538241f085::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index 510c0cb6a36302588b1504909ff035e4305f7b03..b25cdac267614eb25e1a673b664851cd4db6c091 100644
--- a/civicrm/vendor/composer/installed.php
+++ b/civicrm/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'civicrm/civicrm-core',
'pretty_version' => '5.69.x-dev',
'version' => '5.69.9999999.9999999-dev',
- 'reference' => '6e4d81fd36b00bdd7ddcc6984dc2d21bd99f8b37',
+ 'reference' => 'b74e1246ea7d980ff89773c5f22186b95fc4d3bb',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -40,7 +40,7 @@
'civicrm/civicrm-core' => array(
'pretty_version' => '5.69.x-dev',
'version' => '5.69.9999999.9999999-dev',
- 'reference' => '6e4d81fd36b00bdd7ddcc6984dc2d21bd99f8b37',
+ 'reference' => 'b74e1246ea7d980ff89773c5f22186b95fc4d3bb',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 91c8f473b3cb6f3c32e6afde36e051ef16d659e1..e0fb9ccfbce0b39a50e5ae116915d64d56522b8e 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.69.1</version_no>
+ <version_no>5.69.2</version_no>
</version>