Merge pull request #22211 from totten/master-544-fwd

Merge forward 5.44 => master
civicrm · Dec 3, 2021 · 69cd824 · 69cd824
2 parents 291669e + ce7ce07
commit 69cd824
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/release-notes/5.44.0.md b/release-notes/5.44.0.md
@@ -46,7 +46,8 @@ Released December 1, 2021
   Extends download format support for SearchKit to include xlsx, ods and pdf.
 
 - **SearchKit - default displays and ACL-aware links
-  ([21929](https://github.com/civicrm/civicrm-core/pull/21929))**
+  ([21929](https://github.com/civicrm/civicrm-core/pull/21929) and
+  [22108](https://github.com/civicrm/civicrm-core/pull/22108))**
 
   Gives every SavedSearch an auto-generated table display, and makes use
   of it in the UI to more conveniently view or embed a saved search without
@@ -179,6 +180,15 @@ Released December 1, 2021
 - **Accessibility: Fix label associations for DepupeFind template.
   ([21946](https://github.com/civicrm/civicrm-core/pull/21946))**
 
+- **Searchkit: can't use HAVING
+  ([dev/core#2954](https://lab.civicrm.org/dev/core/-/issues/2954):
+  [22130](https://github.com/civicrm/civicrm-core/pull/22130) and
+  [dev/report#83](https://lab.civicrm.org/dev/report/-/issues/83):
+  [22170](https://github.com/civicrm/civicrm-core/pull/22170))**
+
+  This resolves a 5.43.0 regression in the SearchKit UI where the `HAVING`
+  clause could not handle functions.
+
 - **Updates centering of text and tables for Workflow Message Templates
   ([21888](https://github.com/civicrm/civicrm-core/pull/21888),
   [21890](https://github.com/civicrm/civicrm-core/pull/21890),
@@ -287,6 +297,16 @@ Released December 1, 2021
   to a non-Public Mailing Group
   ([21697](https://github.com/civicrm/civicrm-core/pull/21697))**
 
+- **OAUTH2 account creation broken
+  ([dev/mail#105](https://lab.civicrm.org/dev/mail/-/issues/105):
+  [22169](https://github.com/civicrm/civicrm-core/pull/22169))**
+
+### CiviMember
+
+- **Membership status update breaks if override is removed
+  ([dev/core#2974](https://lab.civicrm.org/dev/core/-/issues/2974):
+  [22182](https://github.com/civicrm/civicrm-core/pull/22182))**
+
 ### Drupal Integration
 
 - **"Your browser session has expired and we are unable to complete your form

diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
@@ -421,6 +421,7 @@
           cj('#memberStatus').hide();
           cj('#memberStatus_show').show();
           cj('#status-override-end-date').hide();
+          cj('#status_id option[selected]').removeAttr('selected');
           break;
         case '1':
           cj('#memberStatus').show();
@@ -436,6 +437,7 @@
           cj('#memberStatus').hide( );
           cj('#memberStatus_show').show( );
           cj('#status-override-end-date').hide();
+          cj('#status_id option[selected]').removeAttr('selected');
           break;
       }
     }

diff --git a/tests/phpunit/api/v4/Action/DateTest.php b/tests/phpunit/api/v4/Action/DateTest.php
@@ -71,7 +71,7 @@ public function testRelativeDateRanges() {
 
     // Avoid problems with `strtotime(<date arithmetic expression>)` giving
     // impossible dates like April 31 which roll over and then don't match.
-    $thisMonth = date('m');
+    $thisMonth = (int) date('m');
     $lastMonth = ($thisMonth === 1 ? 12 : $thisMonth - 1);
     $nextMonth = ($thisMonth === 12 ? 1 : $thisMonth + 1);
     $lastMonthsYear = ($thisMonth === 1 ? date('Y') - 1 : date('Y'));