Skip to content

Commit

Permalink
Merge branch '5.67'
Browse files Browse the repository at this point in the history
  • Loading branch information
seamuslee001 committed Nov 1, 2023
2 parents 7954ded + f32106f commit 208cde4
Show file tree
Hide file tree
Showing 16 changed files with 537 additions and 17 deletions.
6 changes: 5 additions & 1 deletion CRM/Core/Error.php
Original file line number Diff line number Diff line change
Expand Up @@ -655,9 +655,13 @@ public static function debug_query_result($query) {
*/
public static function createDebugLogger($prefix = '') {
self::generateLogFileName($prefix);
return Log::singleton('file', \Civi::$statics[__CLASS__]['logger_file' . $prefix], '', [
$log = Log::singleton('file', \Civi::$statics[__CLASS__]['logger_file' . $prefix], '', [
'timeFormat' => '%Y-%m-%d %H:%M:%S%z',
]);
if (is_callable([$log, 'setLocale'])) {
$log->setLocale(CRM_Core_I18n::getLocale());
}
return $log;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions CRM/Event/Form/Participant.php
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,8 @@ public static function formRule($values, $files, $self) {
if (empty($values['payment_instrument_id'])) {
$errorMsg['payment_instrument_id'] = ts('Payment Method is a required field.');
}
if ($self->getPriceSetID()) {
CRM_Price_BAO_PriceField::priceSetValidation($self->getPriceSetID(), $values, $errorMsg);
if (!empty($values['priceSetId'])) {
CRM_Price_BAO_PriceField::priceSetValidation($values['priceSetId'], $values, $errorMsg);
}
}

Expand Down
5 changes: 5 additions & 0 deletions CRM/Price/Page/Option.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,28 +71,33 @@ public static function &actionLinks() {
'url' => 'civicrm/admin/price/field/option/edit',
'qs' => 'reset=1&action=update&oid=%%oid%%&fid=%%fid%%&sid=%%sid%%',
'title' => ts('Edit Price Option'),
'weight' => -50,
],
CRM_Core_Action::VIEW => [
'name' => ts('View'),
'url' => 'civicrm/admin/price/field/option/edit',
'qs' => 'action=view&oid=%%oid%%',
'title' => ts('View Price Option'),
'weight' => CRM_Core_Action::getLabel(CRM_Core_Action::VIEW),
],
CRM_Core_Action::DISABLE => [
'name' => ts('Disable'),
'ref' => 'crm-enable-disable',
'title' => ts('Disable Price Option'),
'weight' => CRM_Core_Action::getLabel(CRM_Core_Action::DISABLE),
],
CRM_Core_Action::ENABLE => [
'name' => ts('Enable'),
'ref' => 'crm-enable-disable',
'title' => ts('Enable Price Option'),
'weight' => CRM_Core_Action::getLabel(CRM_Core_Action::ENABLE),
],
CRM_Core_Action::DELETE => [
'name' => ts('Delete'),
'url' => 'civicrm/admin/price/field/option/edit',
'qs' => 'action=delete&oid=%%oid%%',
'title' => ts('Disable Price Option'),
'weight' => CRM_Core_Action::getLabel(CRM_Core_Action::DELETE),
],
];
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
"Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch"
},
"pear/log": {
"Apply patch for php8.1": "https://patch-diff.githubusercontent.com/raw/pear/Log/pull/23.patch"
"Apply patch for php8.1": "https://gist.githubusercontent.com/totten/d99d47dd9d19a5cb02858954a5577609/raw/0e5e4628a475219c2aec6af76e69894cdec42a55/pear-log-locale.patch"
},
"pear/mail": {
"Apply CiviCRM Customisations for CRM-1367 and CRM-5946": "https://raw.githubusercontent.com/civicrm/civicrm-core/36319938a5bf26c1e7e2110a26a65db6a5979268/tools/scripts/composer/patches/pear-mail.patch"
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 82 additions & 0 deletions release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,24 @@ Released November 1, 2023
- **[Credits](release-notes/5.67.0.md#credits)**
- **[Feedback](release-notes/5.67.0.md#feedback)**

## CiviCRM 5.66.2

Released October 29, 2023

- **[Synopsis](release-notes/5.66.2.md#synopsis)**
- **[Bugs resolved](release-notes/5.66.2.md#bugs)**
- **[Credits](release-notes/5.66.2.md#credits)**
- **[Feedback](release-notes/5.66.2.md#feedback)**

## CiviCRM 5.66.1

Released October 25, 2023

- **[Synopsis](release-notes/5.66.1.md#synopsis)**
- **[Bugs resolved](release-notes/5.66.1.md#bugs)**
- **[Credits](release-notes/5.66.1.md#credits)**
- **[Feedback](release-notes/5.66.1.md#feedback)**

## CiviCRM 5.66.0

Released October 4, 2023
Expand All @@ -37,6 +55,24 @@ Released October 4, 2023
- **[Credits](release-notes/5.66.0.md#credits)**
- **[Feedback](release-notes/5.66.0.md#feedback)**

## CiviCRM 5.65.2

Released September 19, 2023

- **[Synopsis](release-notes/5.65.2.md#synopsis)**
- **[Bugs resolved](release-notes/5.65.2.md#bugs)**
- **[Credits](release-notes/5.65.2.md#credits)**
- **[Feedback](release-notes/5.65.2.md#feedback)**

## CiviCRM 5.65.1

Released September 8, 2023

- **[Synopsis](release-notes/5.65.1.md#synopsis)**
- **[Bugs resolved](release-notes/5.65.1.md#bugs)**
- **[Credits](release-notes/5.65.1.md#credits)**
- **[Feedback](release-notes/5.65.1.md#feedback)**

## CiviCRM 5.65.0

Released September 6, 2023
Expand All @@ -48,6 +84,43 @@ Released September 6, 2023
- **[Credits](release-notes/5.65.0.md#credits)**
- **[Feedback](release-notes/5.65.0.md#feedback)**

## CiviCRM 5.64.4

Released September 6, 2023

- **[Synopsis](release-notes/5.64.4.md#synopsis)**
- **[Security advisories](release-notes/5.64.4.md#security)**
- **[Bugs resolved](release-notes/5.64.4.md#bugs)**
- **[Credits](release-notes/5.64.4.md#credits)**
- **[Feedback](release-notes/5.64.4.md#feedback)**

## CiviCRM 5.64.3

Released September 1, 2023

- **[Synopsis](release-notes/5.64.3.md#synopsis)**
- **[Bugs resolved](release-notes/5.64.3.md#bugs)**
- **[Credits](release-notes/5.64.3.md#credits)**
- **[Feedback](release-notes/5.64.3.md#feedback)**

## CiviCRM 5.64.2

Released August 24, 2023

- **[Synopsis](release-notes/5.64.2.md#synopsis)**
- **[Bugs resolved](release-notes/5.64.2.md#bugs)**
- **[Credits](release-notes/5.64.2.md#credits)**
- **[Feedback](release-notes/5.64.2.md#feedback)**

## CiviCRM 5.64.1

Released August 18, 2023

- **[Synopsis](release-notes/5.64.1.md#synopsis)**
- **[Bugs resolved](release-notes/5.64.1.md#bugs)**
- **[Credits](release-notes/5.64.1.md#credits)**
- **[Feedback](release-notes/5.64.1.md#feedback)**

## CiviCRM 5.64.0

Released August 2, 2023
Expand All @@ -59,6 +132,15 @@ Released August 2, 2023
- **[Credits](release-notes/5.64.0.md#credits)**
- **[Feedback](release-notes/5.64.0.md#feedback)**

## CiviCRM 5.63.3

Released August 2, 2023

- **[Synopsis](release-notes/5.63.3.md#synopsis)**
- **[Bugs resolved](release-notes/5.63.3.md#bugs)**
- **[Credits](release-notes/5.63.3.md#credits)**
- **[Feedback](release-notes/5.63.3.md#feedback)**

## CiviCRM 5.63.2

Released July 26, 2023
Expand Down
41 changes: 41 additions & 0 deletions release-notes/5.63.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# CiviCRM 5.63.3

Released August 2, 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_: Fix editing of certain values in "Contribution Page: Amounts" (PHP8.1) ([dev/core#4453](https://lab.civicrm.org/dev/core/-/issues/4453): [#26953](https://github.com/civicrm/civicrm-core/pull/26953))**
* **_CiviMember_: Fix editing of certain price-set values ([dev/core#4468](https://lab.civicrm.org/dev/core/-/issues/4468), [dev/core#4429](https://lab.civicrm.org/dev/core/-/issues/4429): [#26902](https://github.com/civicrm/civicrm-core/pull/26902))**
* **_SearchKit_: Fix display of arithmetic fields ([dev/core#4455](https://lab.civicrm.org/dev/core/-/issues/4455): [#26944](https://github.com/civicrm/civicrm-core/pull/26944))**

## <a name="credits"></a>Credits

This release was developed by the following authors and reviewers:

Wildsight - Lars Sander-Green; Wikimedia Foundation - Eileen McNaughton; Tadpole
Collective - Kevin Cristiano; Squiffle Consulting - Aidan Saunders; Megaphone Technology
Consulting - Jon Goldberg; JMA Consulting - Seamus Lee; Fuzion - Peter Davis; Dave D;
CiviCRM - Tim Otten, 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`.
44 changes: 44 additions & 0 deletions release-notes/5.64.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# CiviCRM 5.64.1

Released August 18, 2023

- **[Synopsis](#synopsis)**
- **[Bugs resolved](#bugs)**
- **[Credits](#credits)**
- **[Feedback](#feedback)**

## <a name="synopsis"></a>Synopsis

| *Does this version...?* | |
| --------------------------------------------------------------- | -------- |
| **Change the database schema?** | **yes** |
| Alter the API? | no |
| Require attention to configuration options? | no |
| **Fix problems installing or upgrading to a previous version?** | **yes** |
| Introduce features? | no |
| **Fix bugs?** | **yes** |
| Fix security vulnerabilities? | no |

## <a name="bugs"></a>Bugs resolved

* **_CiviEvent_: Warning when sending offline receipt ([dev/core#4494](https://lab.civicrm.org/dev/core/-/issues/4494): [#27066](https://github.com/civicrm/civicrm-core/pull/27066))**
* **_CiviMail_: Selecting a recipient requires administrator permissions ([dev/core#4498](https://lab.civicrm.org/dev/core/-/issues/4498): [#27071](https://github.com/civicrm/civicrm-core/pull/27071))**
* **_CiviMember_: Cannot change "Membership Price Set" on a contribution page ([dev/core#4486](https://lab.civicrm.org/dev/core/-/issues/4486): [#27079](https://github.com/civicrm/civicrm-core/pull/27079), [#27080](https://github.com/civicrm/civicrm-core/pull/27080), [#27083](https://github.com/civicrm/civicrm-core/pull/27083))**
* **_Scheduled Reminders_: Administration screen doesn't open if CiviContribute is disabled ([dev/core#4492](https://lab.civicrm.org/dev/core/-/issues/4492): [#27043](https://github.com/civicrm/civicrm-core/pull/27043))**
* **_Schema_: Drop inconsistent and unnecesary index ([dev/core#4472](https://lab.civicrm.org/dev/core/-/issues/4472): [#27088](https://github.com/civicrm/civicrm-core/pull/27088))**
* **_Search Kit_: In-place editing fails for joined fields ([dev/core#4483](https://lab.civicrm.org/dev/core/-/issues/4483): [#27033](https://github.com/civicrm/civicrm-core/pull/27033))**
* **_Upgrade_: List of active "Components" becomes empty on some sites ([#27075](https://github.com/civicrm/civicrm-core/pull/27075))**

## <a name="credits"></a>Credits

This release was developed by the following authors and reviewers:

Wildsight - Lars Sander-Green; Wikimedia Foundation - Eileen McNaughton; Megaphone
Technology Consulting - Jon Goldberg, Brienne Kordis; JMA Consulting - Seamus Lee; Dave D;
Coop SymbioTIC - Mathieu Lutfy; CiviCRM - Coleman Watts, Tim Otten; CiviCoop - Jaap Jansma

## <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`.
43 changes: 43 additions & 0 deletions release-notes/5.64.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# CiviCRM 5.64.2

Released August 24, 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

* **_CiviMember_: Cannot use CiviMember price-set on new contribution page ([dev/core#4523](https://lab.civicrm.org/dev/core/-/issues/4523): [#27120](https://github.com/civicrm/civicrm-core/pull/27120))**
* **_CiviContribute_: If user enters "Other" amount, then old amount should be unselected ([#27129](https://github.com/civicrm/civicrm-core/pull/27129))**
* **_Form Builder_: Email hyperlinks don't render for some messages ([dev/core#4531](https://lab.civicrm.org/dev/core/-/issues/4531): [#27134](https://github.com/civicrm/civicrm-core/pull/27134/))**
* **_Importer_: Form doesn't update after toggling checkbox ([#27132](https://github.com/civicrm/civicrm-core/pull/27132))**
* **_Send Email_: Form doesn't update after toggling checkbox ([#27132](https://github.com/civicrm/civicrm-core/pull/27132))**
* **_Search Kit_: Bulk actions don't work unless ID column is displayed ([dev/core#4519](https://lab.civicrm.org/dev/core/-/issues/4519): [#27123](https://github.com/civicrm/civicrm-core/pull/27123))**

## <a name="credits"></a>Credits

This release was developed by the following authors and reviewers:

Wildsight - Lars Sander-Green; Wikimedia Foundation - Eileen McNaughton; Megaphone
Technology Consulting - Brienne Kordis; JMA Consulting - Seamus Lee; Dave D; CiviCRM - Tim
Otten, Coleman Watts; Circle Interactive - Pradeep Nayak

## <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`.
40 changes: 40 additions & 0 deletions release-notes/5.64.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# CiviCRM 5.64.3

Released September 1, 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

* **_CiviEvent_: Error when sending registration email (if CiviContribute is disabled) ([dev/core#4537](https://lab.civicrm.org/dev/core/-/issues/4537): [#27237](https://github.com/civicrm/civicrm-core/pull/27237))**
* **_CiviEvent_: Extraneous warning displayed on free event registrations ([dev/core#4538](https://lab.civicrm.org/dev/core/-/issues/4538): [#27221](https://github.com/civicrm/civicrm-core/pull/27221))**

## <a name="credits"></a>Credits

This release was developed by the following authors and reviewers:

Wildsight - Lars Sander-Green; Wikimedia Foundation - Eileen McNaughton;
SYSTOPIA Organisationsberatung - Björn Endres; Megaphone Technology
Consulting - Jon Goldberg; JMA Consulting - Seamus Lee; CiviCRM - Tim Otten;
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`.
Loading

0 comments on commit 208cde4

Please sign in to comment.