diff --git a/civicrm.php b/civicrm.php index 582916aefc23c4477c78ae94e6cf5c2b2bc92767..91d1ce06b9660b55d8a99b0850226a97f1481ba9 100644 --- a/civicrm.php +++ b/civicrm.php @@ -2,7 +2,7 @@ /** * Plugin Name: CiviCRM * Description: CiviCRM - Growing and Sustaining Relationships - * Version: 5.67.1 + * Version: 5.67.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.67.1'); +define('CIVICRM_PLUGIN_VERSION', '5.67.2'); // Store reference to this file. if (!defined('CIVICRM_PLUGIN_FILE')) { diff --git a/civicrm/CRM/Contribute/DAO/ContributionPage.php b/civicrm/CRM/Contribute/DAO/ContributionPage.php index 7ce4c8cc85111db8e714e32602587dd6b576510c..788b6b26f3c4a176c8eeb307e21eb5772cb80251 100644 --- a/civicrm/CRM/Contribute/DAO/ContributionPage.php +++ b/civicrm/CRM/Contribute/DAO/ContributionPage.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionPage.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:84e81e764d43c0d0116ae54d90a18a84) + * (GenCodeChecksum:8c1f3262364d5a5f1255e1f0eb4bf690) */ /** @@ -46,7 +46,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { protected static $_paths = [ 'add' => 'civicrm/admin/contribute/add?reset=1&action=add', 'update' => 'civicrm/admin/contribute/settings?reset=1&action=update&id=[id]', - 'delete' => 'civicrm/admin/contribute?reset=1&action=delete&id=[id]', + 'delete' => 'civicrm/admin/contribute/manage?reset=1&action=delete&id=[id]', 'browse' => 'civicrm/admin/contribute', ]; diff --git a/civicrm/CRM/Contribute/xml/Menu/Contribute.xml b/civicrm/CRM/Contribute/xml/Menu/Contribute.xml index 77b12723e4f1464dfcbb8ded590993d373b1e41a..1757c746a6269cd5e085a93e9ba6aae02993819f 100644 --- a/civicrm/CRM/Contribute/xml/Menu/Contribute.xml +++ b/civicrm/CRM/Contribute/xml/Menu/Contribute.xml @@ -201,7 +201,7 @@ <weight>588</weight> </item> <item> - <path>civicrm/contribute/manage</path> + <path>civicrm/admin/contribute/manage</path> <title>Manage Contribution Pages</title> <page_callback>CRM_Contribute_Page_ContributionPage</page_callback> <access_arguments>administer CiviCRM,access CiviContribute</access_arguments> diff --git a/civicrm/CRM/Core/BAO/UserJob.php b/civicrm/CRM/Core/BAO/UserJob.php index a6ba558f8391f30e250b85d0afb29a9a695ee83f..8f572fa54d4f3dcfdad0f1e78230e418a64cf0fb 100644 --- a/civicrm/CRM/Core/BAO/UserJob.php +++ b/civicrm/CRM/Core/BAO/UserJob.php @@ -154,10 +154,9 @@ class CRM_Core_BAO_UserJob extends CRM_Core_DAO_UserJob implements HookInterface */ public function addSelectWhereClause(string $entityName = NULL, int $userId = NULL, array $conditions = []): array { $clauses = []; - if (!\CRM_Core_Permission::check('administer queues')) { - // @todo - the is_template should really be prefixed. We need to add support - // for that in the compiler & then this would be `{table}.is_template` - $clauses['created_id'] = '= ' . (int) CRM_Core_Session::getLoggedInContactID() . ' OR is_template = 1'; + if (!\CRM_Core_Permission::check('administer queues', $userId)) { + // Only allow access to users' own jobs (or templates) + $clauses['created_id'][] = '= ' . (int) CRM_Core_Session::getLoggedInContactID() . ' OR {is_template} = 1'; } CRM_Utils_Hook::selectWhereClause($this, $clauses, $userId, $conditions); return $clauses; diff --git a/civicrm/CRM/Event/Form/Registration.php b/civicrm/CRM/Event/Form/Registration.php index b33f7ee18ef6aa3675b9bb62d44f27a1ab9d5745..1553c2b03182e4fe10b2e9540ba0aedb1219bfd5 100644 --- a/civicrm/CRM/Event/Form/Registration.php +++ b/civicrm/CRM/Event/Form/Registration.php @@ -504,8 +504,11 @@ class CRM_Event_Form_Registration extends CRM_Core_Form { * @param string $name */ public function buildCustom($id, $name) { + if ($name === 'customPost') { + $this->assign('postPageProfiles', []); + } + $this->assign($name, []); if (!$id) { - $this->assign($name, []); return; } @@ -564,6 +567,16 @@ class CRM_Event_Form_Registration extends CRM_Core_Form { ) { CRM_Core_BAO_Address::checkContactSharedAddressFields($fields, $contactID); } + if ($name === 'customPost') { + $postPageProfiles = []; + foreach ($fields as $fieldName => $field) { + $postPageProfiles[$field['groupName']][$fieldName] = $field; + } + $this->assign('postPageProfiles', $postPageProfiles); + } + // We still assign the customPost in the way we used to because we haven't ruled out being + // used after the register form - but in the register form it is overwritten by a for-each + // with the smarty code. $this->assign($name, $fields); if (is_array($fields)) { $button = substr($this->controller->getButtonName(), -4); diff --git a/civicrm/CRM/Utils/Date.php b/civicrm/CRM/Utils/Date.php index 2434fb33e06c5400e66ccb50c24cb2a5e641f965..dfcff429c3193ddf135128fcc9394d4fa874e725 100644 --- a/civicrm/CRM/Utils/Date.php +++ b/civicrm/CRM/Utils/Date.php @@ -1987,7 +1987,7 @@ class CRM_Utils_Date { $field['smarty_view_format'] = $dateAttributes['smarty_view_format']; } $field['datepicker']['extra'] = self::getDatePickerExtra($field); - $field['datepicker']['extra']['time'] = $fieldMetaData['type'] == CRM_Utils_Type::T_TIMESTAMP; + $field['datepicker']['extra']['time'] = $fieldMetaData['type'] == CRM_Utils_Type::T_TIMESTAMP || $fieldMetaData['type'] == (CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME); $field['datepicker']['attributes'] = self::getDatePickerAttributes($field); } } diff --git a/civicrm/CRM/Utils/Mail/EmailProcessor.php b/civicrm/CRM/Utils/Mail/EmailProcessor.php index 813dc1d15a266d0ebe9a117ebc51ca7a880b26b7..edc5a3aeb4f85380e7aea3a5074196f237ac3573 100644 --- a/civicrm/CRM/Utils/Mail/EmailProcessor.php +++ b/civicrm/CRM/Utils/Mail/EmailProcessor.php @@ -118,7 +118,14 @@ class CRM_Utils_Mail_EmailProcessor { // process fifty at a time, CRM-4002 while ($mails = $store->fetchNext(MAIL_BATCH_SIZE)) { foreach ($mails as $key => $mail) { - $incomingMail = new CRM_Utils_Mail_IncomingMail($mail, (string) $dao->domain, (string) $dao->localpart); + try { + $incomingMail = new CRM_Utils_Mail_IncomingMail($mail, (string) $dao->domain, (string) $dao->localpart); + } + catch (CRM_Core_Exception $e) { + $store->markIgnored($key); + continue; + } + $action = $incomingMail->getAction(); $job = $incomingMail->getJobID(); $queue = $incomingMail->getQueueID(); diff --git a/civicrm/CRM/Utils/Mail/IncomingMail.php b/civicrm/CRM/Utils/Mail/IncomingMail.php index 4bd444bb35ebc26d23065a0b0f2c5f712bd54166..47177d12feb141e4b292ed8ffec52644353489d5 100644 --- a/civicrm/CRM/Utils/Mail/IncomingMail.php +++ b/civicrm/CRM/Utils/Mail/IncomingMail.php @@ -217,7 +217,7 @@ class CRM_Utils_Mail_IncomingMail { 'id' => $queue->id, 'hash' => $queue->hash, 'contact_id' => $queue->contact_id, - 'job_id' => $queue->contact_id, + 'job_id' => $queue->job_id, ]); $this->define('Mailing', 'Mailing', [ 'id' => MailingJob::get(FALSE) diff --git a/civicrm/Civi/Api4/Event/Subscriber/AutocompleteFieldSubscriber.php b/civicrm/Civi/Api4/Event/Subscriber/AutocompleteFieldSubscriber.php index 3943c2a29905b44902277cc1d66223c597185e7f..05d955740f141f429da7f7fe859e1a4c39957a12 100644 --- a/civicrm/Civi/Api4/Event/Subscriber/AutocompleteFieldSubscriber.php +++ b/civicrm/Civi/Api4/Event/Subscriber/AutocompleteFieldSubscriber.php @@ -67,6 +67,11 @@ class AutocompleteFieldSubscriber extends AutoService implements EventSubscriber $apiRequest->addFilter($key, $value); } + // Autocomplete for field with option values + if ($apiRequest->getEntityName() === 'OptionValue' && !empty($fieldSpec['custom_field_id'])) { + $apiRequest->setKey('value'); + } + if ($formType === 'qf') { $this->autocompleteProfilePermissions($apiRequest, $formName, $fieldSpec); } diff --git a/civicrm/Civi/Api4/Generic/AutocompleteAction.php b/civicrm/Civi/Api4/Generic/AutocompleteAction.php index fe87afe8d2996f3078493d1a5c665e8161a27792..d50c62f9f363b48b87e7e5d88d56efcb4ef0d77a 100644 --- a/civicrm/Civi/Api4/Generic/AutocompleteAction.php +++ b/civicrm/Civi/Api4/Generic/AutocompleteAction.php @@ -285,6 +285,10 @@ class AutocompleteAction extends AbstractAction { */ private function getKeyField() { $entityName = $this->savedSearch['api_entity']; + // Temp hack for 5.67. Fixed in 5.68. See https://github.com/civicrm/civicrm-core/pull/28283 + if ($entityName === 'OptionValue' && $this->key === 'value') { + return 'value'; + } if ($this->key) { /** @var \CRM_Core_DAO $dao */ $dao = CoreUtil::getInfoItem($entityName, 'dao'); diff --git a/civicrm/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php b/civicrm/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php index a4254ae72a154c59af8a451418a9b51e8b5216d5..cc1fd222d57dcc2a0f700cf0c3db53356306cc82 100644 --- a/civicrm/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php +++ b/civicrm/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php @@ -25,7 +25,7 @@ class SqlFunctionGROUP_CONCAT extends SqlFunction { protected static function params(): array { return [ [ - 'flag_before' => ['' => NULL, 'DISTINCT' => ts('Distinct Value'), 'UNIQUE' => ts('Unique Record')], + 'flag_before' => ['' => ts('All'), 'DISTINCT' => ts('Distinct Value'), 'UNIQUE' => ts('Unique Record')], 'max_expr' => 1, 'must_be' => ['SqlField', 'SqlFunction', 'SqlEquation'], 'optional' => FALSE, diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php index 87c7b77fab6d5c3521a9f0c4e0be519f8f0e861d..4a8590746de509dc7369c11c6fe4e277d4c276a4 100644 --- a/civicrm/civicrm-version.php +++ b/civicrm/civicrm-version.php @@ -1,7 +1,7 @@ <?php /** @deprecated */ function civicrmVersion( ) { - return array( 'version' => '5.67.1', + return array( 'version' => '5.67.2', 'cms' => 'Wordpress', 'revision' => '' ); } diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml index 59aff5bc09a55aed193850833995415bd50b0934..c64338355a68cb98c5ba84b024d20e9e951f5842 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.67.1</version> + <version>5.67.2</version> <develStage>beta</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml index 88a9e06301ece122276eb760b88eb2be87798363..2472bd3464f8ab25bacd775837806f843607d228 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.67.1</version> + <version>5.67.2</version> <compatibility> <ver>5.67</ver> </compatibility> diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml index 91cdc582422d8164ee5bd87146c1714874712211..b786160119bac15eda02665cee0578e8e2af3770 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.67.1</version> + <version>5.67.2</version> <develStage>alpha</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml index 60b5baec5fdbca70a65374d9c237f7dfb01ecb47..9eb4b36cfea797e1e18780c4d090476af85ac2b4 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.67.1</version> + <version>5.67.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml index 1d7d6c9323cebe1968d132e9bc94ab330862154f..4b3f644a346e3da9d30e246e98d2ff9eb14b0e6b 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.67.1</version> + <version>5.67.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 afe15abe5e28cd5ec50f93003f3f2e1fbb1e0e69..8be2ea3c06dd83b2115476ad8aff3427e4c99f63 100644 --- a/civicrm/ext/civi_campaign/info.xml +++ b/civicrm/ext/civi_campaign/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.67.1</version> + <version>5.67.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 7a89beaca6f7de017c02229850604f235445df78..e31981c4ec25ce5430482b8317f7e0ec36083097 100644 --- a/civicrm/ext/civi_case/info.xml +++ b/civicrm/ext/civi_case/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.67.1</version> + <version>5.67.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 c63d22e2699f269cbcbf1fa4d7014ff6ad4bf1c7..5ee57c00675642449e19e14da565751abeb17137 100644 --- a/civicrm/ext/civi_contribute/info.xml +++ b/civicrm/ext/civi_contribute/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.67.1</version> + <version>5.67.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 c0e2ea5d07067c911cd28fe4f0966dd38b4ce507..cdace83190e8ff5ecc8668c52781838c10519e50 100644 --- a/civicrm/ext/civi_event/info.xml +++ b/civicrm/ext/civi_event/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.67.1</version> + <version>5.67.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 69f5727dd611212e9cfd6ce3adbf0c8df0b52901..e78ba05daaf8014c2e07ca5aa19fa404536ebd14 100644 --- a/civicrm/ext/civi_mail/info.xml +++ b/civicrm/ext/civi_mail/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.67.1</version> + <version>5.67.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 d325809205cad37aa9f9b0368e70b5bc86ffc7a1..ed75efc1f1bd4fb378dd82dacea14f25290e53d0 100644 --- a/civicrm/ext/civi_member/info.xml +++ b/civicrm/ext/civi_member/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.67.1</version> + <version>5.67.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 a40a19a6d79339b918a3d250e433af99b004125f..599b37f688339246d7dd049cdb60cf93c758c825 100644 --- a/civicrm/ext/civi_pledge/info.xml +++ b/civicrm/ext/civi_pledge/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.67.1</version> + <version>5.67.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 5d58c5ab76e0951053c75e90c070262ef9ebb0f8..f8e807331df1d4bfc4f84b57fddb47bef01890e3 100644 --- a/civicrm/ext/civi_report/info.xml +++ b/civicrm/ext/civi_report/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.67.1</version> + <version>5.67.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 f606dcc651c6f0614c22c0775d907bb6fc557c50..c32766c7e6fd3e988149f56e3b51a58e6ff24a05 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.67.1</version> + <version>5.67.2</version> <develStage>beta</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php b/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php index d263bece3904db104ba3cb728276c57c6afac250..c2504145a9f7dba1012b42dc2b039c7db566067c 100644 --- a/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php +++ b/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php @@ -200,7 +200,7 @@ return [ 'condition' => [], ], [ - 'path' => 'civicrm/admin/contribute?action=copy&gid=[id]', + 'path' => 'civicrm/admin/contribute/manage?action=copy&gid=[id]', 'icon' => 'fa-clone', 'text' => E::ts('Clone'), 'style' => 'secondary', @@ -230,7 +230,7 @@ return [ ], [ 'entity' => 'ContributionPage', - 'action' => 'delete', + 'action' => '', 'join' => '', 'target' => 'crm-popup', 'icon' => 'fa-trash', @@ -238,6 +238,7 @@ return [ 'style' => 'danger', 'path' => '', 'condition' => [], + 'task' => 'delete', ], ], 'type' => 'buttons', diff --git a/civicrm/ext/civicrm_search_ui/info.xml b/civicrm/ext/civicrm_search_ui/info.xml index 04946eeaaa1eaa07e355b5b64610dfbfcee627be..69dd7916df2f59760f85b9d0edeea70be0c940f4 100644 --- a/civicrm/ext/civicrm_search_ui/info.xml +++ b/civicrm/ext/civicrm_search_ui/info.xml @@ -15,7 +15,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-07-17</releaseDate> - <version>5.67.1</version> + <version>5.67.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 6f1b8a82eb41dcae9baa0eff3fbe5d2ffa7edcab..e190f0b78bd7ae264bd165fac0baeca5d2c744e1 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.67.1</version> + <version>5.67.2</version> <develStage>stable</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml index 859372dd4b4c26c3c51acf330a1bc9d9777d917c..07a39ba7b889bf081a2a22b7ecbea12aea657530 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.67.1</version> + <version>5.67.2</version> <develStage>alpha</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml index 53b8bf50bc34230bb407d58b3cdbc62bc044c267..aa2810b79d1aa9a697b4d5dc3e36ecfd8c1c1309 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.67.1</version> + <version>5.67.2</version> <develStage>stable</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml index a4b5966115fc958d61d89c17eb268347000471f6..8d7337a9c48183069c72dfdc2a9044b64d621b61 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.67.1</version> + <version>5.67.2</version> <develStage>stable</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml index 8f08d833e01261590cd9f4e60628754034a28603..cc0201a5206be0d95f6f1e0d8682f0a282a0d112 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.67.1</version> + <version>5.67.2</version> <develStage>stable</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml index 591eb33b46b27853a0cb29f08b941a9725d077fc..49fca0c7dceebd858f3c596ceb0bcb208059337f 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.67.1</version> + <version>5.67.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml index 42990fa5848b0e95c46b1dde0c90104d6b0fc87e..34966cb2ff1c1120002c0aa4e2a0c3696f58ac64 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.67.1</version> + <version>5.67.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml index 4748f244ed86b29a8eb4b3f82f1709b909fe215e..a38641df811844d05e1944a994ee1a1b9aa3e0cf 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.67.1</version> + <version>5.67.2</version> <develStage>stable</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml index 414076a81fdfb54b7c04046509e6c2f3b4e2c8d1..650ecc16af723c905951be12e8c81687bfb6290d 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.67.1</version> + <version>5.67.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 c8eb5973783577f5cdcf4a0fd6094a485552a13b..01d6dbfb02d4c51c632697c98b220364510efe33 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.67.1</version> + <version>5.67.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml index 2b9df5862bfb33d14d58544afac2f022d7eb133e..e81708a1fd249185c3fc8c6e5eeb7b1ffd9750f4 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.67.1</version> + <version>5.67.2</version> <develStage>stable</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml index 69995a6b0b9d9a9f655eee0e382854f2d88dad4d..f2add816b4fa1244f45317a902548ada23befc79 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.67.1</version> + <version>5.67.2</version> <develStage>alpha</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml index 7c753aadacb3806654fee0078b9121359a3431c0..d1f00d96b3bcf442d9f315b64c5a7c5e69363919 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.67.1</version> + <version>5.67.2</version> <develStage>stable</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml index 327c12973f12cd0dedc3e5ce97eda5b7db76a0fd..a97a8fd886a262322188079b45b46e8a5819fba7 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.67.1</version> + <version>5.67.2</version> <develStage>stable</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml index 9aa5e2d3b4fa7d178da5389caf825b508f7a1652..a778f5fa45e1d5f380a6685a294a5e61219ad3f1 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.67.1</version> + <version>5.67.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 d14518df4225213ad8329d4fdaffc5250741809e..a02b8a22eefd7ee417c66a2d6bf6ea002c86a914 100644 --- a/civicrm/ext/scheduled_communications/info.xml +++ b/civicrm/ext/scheduled_communications/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-09-04</releaseDate> - <version>5.67.1</version> + <version>5.67.2</version> <develStage>beta</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml index 42779bd9e75357e8815c23c1fbf351f56b40a0f0..dfdfde5655bed076394615752b14fb14495b5f75 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.67.1</version> + <version>5.67.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 326d6fdd673bfd4e26ee0d7153c3010eab3e27c0..20f7e76b06b405f98fff5dfaeb9f322fda06a170 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.67.1</version> + <version>5.67.2</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/standaloneusers/info.xml b/civicrm/ext/standaloneusers/info.xml index 452f264d521de8f20a8ead7e5209292afed3da93..f9ca3c9dc8a13240d514ec3f2d1c5c939acd72d9 100644 --- a/civicrm/ext/standaloneusers/info.xml +++ b/civicrm/ext/standaloneusers/info.xml @@ -15,7 +15,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2022-11-11</releaseDate> - <version>5.67.1</version> + <version>5.67.2</version> <develStage>alpha</develStage> <compatibility> <ver>5.67</ver> diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md index 2eb7202462a4228b81c9c02848fff7e2b6d6ff27..1542bb8b7e59d855241055f21a3b438fcd056a3f 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.67.2 + +Released November 28, 2023 + +- **[Synopsis](release-notes/5.67.2.md#synopsis)** +- **[Bugs resolved](release-notes/5.67.2.md#bugs)** +- **[Credits](release-notes/5.67.2.md#credits)** +- **[Feedback](release-notes/5.67.2.md#feedback)** + ## CiviCRM 5.67.1 Released November 15, 2023 diff --git a/civicrm/release-notes/5.67.2.md b/civicrm/release-notes/5.67.2.md new file mode 100644 index 0000000000000000000000000000000000000000..8e4e81b5d0ca040544937e179bb21aa99982d894 --- /dev/null +++ b/civicrm/release-notes/5.67.2.md @@ -0,0 +1,45 @@ +# CiviCRM 5.67.2 + +Released November 28, 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 + +* **_CiviContribute_: Field "Contribution date" does not appear in "Edit" mode ([dev/financial#221](https://lab.civicrm.org/dev/financial/-/issues/221): [#28243](https://github.com/civicrm/civicrm-core/pull/28243))** +* **_CiviContribute_: With "Admin UI" extension, some actions don't work ([#28189](https://github.com/civicrm/civicrm-core/pull/28189))** +* **_CiviEvent_: Registration screen with multiple profiles does not display correctly ([dev/core#4766](https://lab.civicrm.org/dev/core/-/issues/4766): [#28246](https://github.com/civicrm/civicrm-core/pull/28246))** +* **_CiviMail_: Improper bounce-messages should fail gracefully ([dev/core#4780](https://lab.civicrm.org/dev/core/-/issues/4780): [#28192](https://github.com/civicrm/civicrm-core/pull/28192))** +* **_Custom Fields_: Certain custom fields do not display correctly ([dev/core#4799](https://lab.civicrm.org/dev/core/-/issues/4799): [#28283](https://github.com/civicrm/civicrm-core/pull/28283))** +* **_Import (et al)_: Fix new and extraneous notice for certain users ([#28325](https://github.com/civicrm/civicrm-core/pull/28325))** +* **_Inbound Mail_: Fix new (but inconsistent) metadata ([#28244](https://github.com/civicrm/civicrm-core/pull/28244))** +* **_Search Kit_: Fix missing label for `GROUP_CONCAT` function ([#28187](https://github.com/civicrm/civicrm-core/pull/28187))** + +## <a name="credits"></a>Credits + +This release was developed by the following authors and reviewers: + +Wikimedia Foundation - Eileen McNaughton; Squiffle Consulting - Aidan Saunders; Megaphone +Technology Consulting - Brienne Kordis; Lighthouse Consulting and Design - Brian +Shaughnessy; Dave D; CiviCRM - Coleman Watts; 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 88717a1d2867f6c12b94852fc6c7e680d07008ac..b008d34a579663eeb8fe1890ae5fb66eb8dad1ab 100644 --- a/civicrm/sql/civicrm_data.mysql +++ b/civicrm/sql/civicrm_data.mysql @@ -23580,4 +23580,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.67.1'; +UPDATE civicrm_domain SET version = '5.67.2'; diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql index 95d397236d1a40c98c5ac1a546aa8d2baf2fd963..2d6205e84138533280e20061b4fd51059a0c83f6 100644 --- a/civicrm/sql/civicrm_generated.mysql +++ b/civicrm/sql/civicrm_generated.mysql @@ -2970,7 +2970,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.67.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.67.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl index f3fd1af0368fdf8bf1d730f7a856b2f2a211fd76..1a2b77367c0d472f4ce8e5e19c31e9beec86ecbf 100644 --- a/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl +++ b/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl @@ -88,7 +88,7 @@ {if $isSearch eq 1} <div class="status messages"> <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/> - {capture assign=browseURL}{crmURL p='civicrm/contribute/manage' q="reset=1"}{/capture} + {capture assign=browseURL}{crmURL p='civicrm/admin/contribute/manage' q="reset=1"}{/capture} {ts}No available Contribution Pages match your search criteria. Suggestions:{/ts} <div class="spacer"></div> <ul> diff --git a/civicrm/templates/CRM/Event/Form/Registration/Register.tpl b/civicrm/templates/CRM/Event/Form/Registration/Register.tpl index 496581b3eb526baf36c0c68383666998c3f7e998..747a74e154d313b6e6c7039d911ac20281840cf6 100644 --- a/civicrm/templates/CRM/Event/Form/Registration/Register.tpl +++ b/civicrm/templates/CRM/Event/Form/Registration/Register.tpl @@ -135,7 +135,9 @@ {/if} <div class="crm-public-form-item crm-section custom_post-section"> - {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false} + {foreach from=$postPageProfiles item=customPost} + {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false} + {/foreach} </div> <div id="crm-submit-buttons" class="crm-submit-buttons"> diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php index 76e0e2c028ff723f5af182c6dda5870b55fdab77..7d4e7bbf6a73d37a59bfa3e09d0bab458e54e907 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 ComposerAutoloaderInit299545d8663dedab9b6feed155a47593::getLoader(); +return ComposerAutoloaderInitaaaec4094b2333d842e31c30509e73f6::getLoader(); diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php index 755285292afee0ddaeb868288493b0232a605398..a9564d1a34ed6730cc581e9e54120f39f160b9d1 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 ComposerAutoloaderInit299545d8663dedab9b6feed155a47593 +class ComposerAutoloaderInitaaaec4094b2333d842e31c30509e73f6 { private static $loader; @@ -24,22 +24,22 @@ class ComposerAutoloaderInit299545d8663dedab9b6feed155a47593 require __DIR__ . '/platform_check.php'; - spl_autoload_register(array('ComposerAutoloaderInit299545d8663dedab9b6feed155a47593', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitaaaec4094b2333d842e31c30509e73f6', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit299545d8663dedab9b6feed155a47593', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitaaaec4094b2333d842e31c30509e73f6', '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\ComposerStaticInit299545d8663dedab9b6feed155a47593::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::getInitializer($loader)); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInit299545d8663dedab9b6feed155a47593::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire299545d8663dedab9b6feed155a47593($fileIdentifier, $file); + composerRequireaaaec4094b2333d842e31c30509e73f6($fileIdentifier, $file); } return $loader; @@ -51,7 +51,7 @@ class ComposerAutoloaderInit299545d8663dedab9b6feed155a47593 * @param string $file * @return void */ -function composerRequire299545d8663dedab9b6feed155a47593($fileIdentifier, $file) +function composerRequireaaaec4094b2333d842e31c30509e73f6($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 020c735606dee004e1fd2e550cf6ac375d99172e..6e94ff5741050364d92573cb767b9906b4784d5a 100644 --- a/civicrm/vendor/composer/autoload_static.php +++ b/civicrm/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit299545d8663dedab9b6feed155a47593 +class ComposerStaticInitaaaec4094b2333d842e31c30509e73f6 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -729,11 +729,11 @@ class ComposerStaticInit299545d8663dedab9b6feed155a47593 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit299545d8663dedab9b6feed155a47593::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit299545d8663dedab9b6feed155a47593::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit299545d8663dedab9b6feed155a47593::$prefixesPsr0; - $loader->fallbackDirsPsr0 = ComposerStaticInit299545d8663dedab9b6feed155a47593::$fallbackDirsPsr0; - $loader->classMap = ComposerStaticInit299545d8663dedab9b6feed155a47593::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$prefixesPsr0; + $loader->fallbackDirsPsr0 = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$fallbackDirsPsr0; + $loader->classMap = ComposerStaticInitaaaec4094b2333d842e31c30509e73f6::$classMap; }, null, ClassLoader::class); } diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php index 3c44695f6b33aa9530613b030253861725abc7ec..365b6a2a77e2667b1bddff7c96848916f94fbf05 100644 --- a/civicrm/vendor/composer/installed.php +++ b/civicrm/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'civicrm/civicrm-core', 'pretty_version' => '5.67.x-dev', 'version' => '5.67.9999999.9999999-dev', - 'reference' => 'debcc7374594566ab1505a8cec30cb19e8ee34ba', + 'reference' => '96087db59731da8ba882203be81beeedacdec2a1', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -40,7 +40,7 @@ 'civicrm/civicrm-core' => array( 'pretty_version' => '5.67.x-dev', 'version' => '5.67.9999999.9999999-dev', - 'reference' => 'debcc7374594566ab1505a8cec30cb19e8ee34ba', + 'reference' => '96087db59731da8ba882203be81beeedacdec2a1', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/civicrm/xml/schema/Contribute/ContributionPage.xml b/civicrm/xml/schema/Contribute/ContributionPage.xml index c0e030b048f203c57e380ca35a4beb1bfd567854..92feacda65fbbebd5373be8af8cfcf1f609f4ea5 100644 --- a/civicrm/xml/schema/Contribute/ContributionPage.xml +++ b/civicrm/xml/schema/Contribute/ContributionPage.xml @@ -12,7 +12,7 @@ <paths> <add>civicrm/admin/contribute/add?reset=1&action=add</add> <update>civicrm/admin/contribute/settings?reset=1&action=update&id=[id]</update> - <delete>civicrm/admin/contribute?reset=1&action=delete&id=[id]</delete> + <delete>civicrm/admin/contribute/manage?reset=1&action=delete&id=[id]</delete> <browse>civicrm/admin/contribute</browse> </paths> <field> diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml index e59ae0b39565a060aeae7d2d9b3b3cf4c95ab693..0dc367fc07525ceb511fae2a4c89c529e6559406 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.67.1</version_no> + <version_no>5.67.2</version_no> </version>