From f2d80f5a35d5a376b5982f06f10ab596cc758686 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Sat, 23 Apr 2022 10:06:21 -0700
Subject: [PATCH] civicrm release-5.48.2
---
civicrm.php | 4 +-
civicrm/CRM/Contact/BAO/RelationshipType.php | 3 +-
civicrm/CRM/Contribute/BAO/Contribution.php | 44 +++++++++----------
.../CRM/Contribute/Form/ContributionView.php | 2 +
civicrm/civicrm-version.php | 2 +-
civicrm/ext/afform/admin/info.xml | 2 +-
civicrm/ext/afform/core/info.xml | 2 +-
civicrm/ext/afform/html/info.xml | 2 +-
civicrm/ext/afform/mock/info.xml | 2 +-
civicrm/ext/authx/info.xml | 2 +-
civicrm/ext/civicrm_admin_ui/info.xml | 2 +-
civicrm/ext/civigrant/info.xml | 2 +-
civicrm/ext/ckeditor4/info.xml | 2 +-
.../ext/contributioncancelactions/info.xml | 2 +-
civicrm/ext/eventcart/info.xml | 2 +-
civicrm/ext/ewaysingle/info.xml | 2 +-
civicrm/ext/financialacls/financialacls.php | 7 +--
civicrm/ext/financialacls/info.xml | 2 +-
civicrm/ext/flexmailer/info.xml | 2 +-
civicrm/ext/greenwich/info.xml | 2 +-
civicrm/ext/legacycustomsearches/info.xml | 2 +-
civicrm/ext/message_admin/info.xml | 2 +-
civicrm/ext/oauth-client/info.xml | 2 +-
civicrm/ext/payflowpro/info.xml | 2 +-
civicrm/ext/recaptcha/info.xml | 2 +-
.../SearchDisplay/AbstractRunAction.php | 12 +++--
civicrm/ext/search_kit/info.xml | 2 +-
.../api/v4/SearchDisplay/SearchRunTest.php | 39 ++++++++++++++++
civicrm/ext/sequentialcreditnotes/info.xml | 2 +-
civicrm/release-notes.md | 9 ++++
civicrm/release-notes/5.48.2.md | 42 ++++++++++++++++++
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
.../CRM/Contribute/Form/PaymentInfoBlock.tpl | 2 +-
civicrm/templates/CRM/common/formButtons.tpl | 2 +-
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 14 +++---
civicrm/vendor/composer/autoload_static.php | 12 ++---
civicrm/xml/version.xml | 2 +-
39 files changed, 169 insertions(+), 75 deletions(-)
create mode 100644 civicrm/release-notes/5.48.2.md
diff --git a/civicrm.php b/civicrm.php
index afda81f2c6..f85fdf8559 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.48.1
+ * Version: 5.48.2
* Requires at least: 4.9
* Requires PHP: 7.2
* 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.48.1');
+define('CIVICRM_PLUGIN_VERSION', '5.48.2');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Contact/BAO/RelationshipType.php b/civicrm/CRM/Contact/BAO/RelationshipType.php
index 349b9d9991..b2cc785173 100644
--- a/civicrm/CRM/Contact/BAO/RelationshipType.php
+++ b/civicrm/CRM/Contact/BAO/RelationshipType.php
@@ -126,6 +126,8 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType
/**
* Get the id of the employee relationship, checking it is valid.
+ * We check that contact_type_a is Individual, but not contact_type_b because there's
+ * nowhere in the code that requires it to be Organization.
*
* @return int|string
*
@@ -137,7 +139,6 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType
$relationship = RelationshipType::get(FALSE)
->addWhere('name_a_b', '=', 'Employee of')
->addWhere('contact_type_a', '=', 'Individual')
- ->addWhere('contact_type_b', '=', 'Organization')
->addSelect('id')->execute()->first();
if (empty($relationship)) {
throw new API_Exception('no valid relationship');
diff --git a/civicrm/CRM/Contribute/BAO/Contribution.php b/civicrm/CRM/Contribute/BAO/Contribution.php
index b84a36269d..0813283626 100644
--- a/civicrm/CRM/Contribute/BAO/Contribution.php
+++ b/civicrm/CRM/Contribute/BAO/Contribution.php
@@ -4271,50 +4271,50 @@ LIMIT 1;";
}
$actionLinks = [];
$actionLinks[] = [
- 'url' => CRM_Utils_System::url('civicrm/payment', [
- 'action' => 'add',
- 'reset' => 1,
- 'id' => $id,
- 'is_refund' => 0,
- ]),
+ 'url' => 'civicrm/payment',
'title' => ts('Record Payment'),
'accessKey' => '',
'ref' => '',
'name' => '',
- 'qs' => '',
+ 'qs' => [
+ 'action' => 'add',
+ 'reset' => 1,
+ 'id' => $id,
+ 'is_refund' => 0,
+ ],
'extra' => '',
];
if (CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
$actionLinks[] = [
- 'url' => CRM_Utils_System::url('civicrm/payment', [
+ 'url' => 'civicrm/payment',
+ 'title' => ts('Submit Credit Card payment'),
+ 'accessKey' => '',
+ 'ref' => '',
+ 'name' => '',
+ 'qs' => [
'action' => 'add',
'reset' => 1,
'is_refund' => 0,
'id' => $id,
'mode' => 'live',
- ]),
- 'title' => ts('Submit Credit Card payment'),
- 'accessKey' => '',
- 'ref' => '',
- 'name' => '',
- 'qs' => '',
+ ],
'extra' => '',
];
}
if ($contributionStatus !== 'Pending') {
$actionLinks[] = [
- 'url' => CRM_Utils_System::url('civicrm/payment', [
- 'action' => 'add',
- 'reset' => 1,
- 'id' => $id,
- 'is_refund' => 1,
- ]),
+ 'url' => 'civicrm/payment',
'title' => ts('Record Refund'),
'accessKey' => '',
'ref' => '',
'name' => '',
- 'qs' => '',
+ 'qs' => [
+ 'action' => 'add',
+ 'reset' => 1,
+ 'id' => $id,
+ 'is_refund' => 1,
+ ],
'extra' => '',
];
}
@@ -4375,7 +4375,7 @@ LIMIT 1;";
$clauses = [];
foreach ($whereClauses as $key => $clause) {
- $clauses[] = 'b.' . $key . ' ' . implode(' AND b.' . $key, (array) $clause);
+ $clauses[] = 'b.' . $key . ' ' . implode(' AND b.' . $key . ' ', (array) $clause);
}
$clauses[] = 'b.contact_id IN (' . $contactIDs . ')';
$clauses[] = 'b.is_test = 0';
diff --git a/civicrm/CRM/Contribute/Form/ContributionView.php b/civicrm/CRM/Contribute/Form/ContributionView.php
index f71c4272da..3c3b542171 100644
--- a/civicrm/CRM/Contribute/Form/ContributionView.php
+++ b/civicrm/CRM/Contribute/Form/ContributionView.php
@@ -308,6 +308,7 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
'title' => $invoiceButtonText,
'url' => 'civicrm/contribute/invoice',
'qs' => $pdfUrlParams,
+ 'class' => 'no-popup',
'icon' => 'fa-download',
];
$linkButtons[] = [
@@ -357,6 +358,7 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
$paymentInfo = CRM_Contribute_BAO_Contribution::getPaymentInfo($id, 'contribution', TRUE);
$title = ts('View Payment');
$this->assign('transaction', TRUE);
+ // Used in paymentInfoBlock.tpl
$this->assign('payments', $paymentInfo['transaction']);
$this->assign('paymentLinks', $paymentInfo['payment_links']);
return $title;
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 41ba61c14a..78cada296d 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.48.1',
+ return array( 'version' => '5.48.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 971c7e3eec..bed00b3897 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.48.1</version>
+ <version>5.48.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index d3d82d4adc..4c7821ebda 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.48.1</version>
+ <version>5.48.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index a9ccac23e9..88590bda6e 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.48.1</version>
+ <version>5.48.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index cfccd66025..eda93272b1 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.48.1</version>
+ <version>5.48.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 0b9a4312cf..05876bddf6 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.48.1</version>
+ <version>5.48.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index 9955a51d17..e6223b7361 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.48.1</version>
+ <version>5.48.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.47</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 07910abd5e..709e1b9e16 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.48.1</version>
+ <version>5.48.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.47</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 07302913a5..aac0b6dc27 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.48.1</version>
+ <version>5.48.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.39</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 51419f994d..bff6814e23 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.48.1</version>
+ <version>5.48.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.32</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index fd4a37e370..779bf71e51 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.48.1</version>
+ <version>5.48.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 3b85d6952d..0e2d12ec0f 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.48.1</version>
+ <version>5.48.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/financialacls.php b/civicrm/ext/financialacls/financialacls.php
index 4870bf4a97..45366d57ba 100644
--- a/civicrm/ext/financialacls/financialacls.php
+++ b/civicrm/ext/financialacls/financialacls.php
@@ -224,12 +224,9 @@ function _financialacls_civicrm_get_accessible_financial_types(): array {
* @throws \API_Exception
*/
function _financialacls_civicrm_get_membership_type_clause(): string {
- if (!CRM_Core_Component::isEnabled('CiviMember')) {
- return 1;
- }
$financialTypes = _financialacls_civicrm_get_accessible_financial_types();
- if ($financialTypes === [0]) {
- return 0;
+ if ($financialTypes === [0] || !CRM_Core_Component::isEnabled('CiviMember')) {
+ return '= 0';
}
$membershipTypes = (array) MembershipType::get(FALSE)
->addWhere('financial_type_id', 'IN', $financialTypes)->execute()->indexBy('id');
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 7ab1cc44f2..c870df2f95 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.48.1</version>
+ <version>5.48.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.30</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 8620da21c1..7c23f46125 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.48.1</version>
+ <version>5.48.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 454c45a0a8..268523cfad 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.48.1</version>
+ <version>5.48.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index a15d0af6ad..e40289e602 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.48.1</version>
+ <version>5.48.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:hidden</tag>
diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml
index 5645a3e97f..83ed10ac01 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.48.1</version>
+ <version>5.48.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index ad638ca91a..7b7781e219 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.48.1</version>
+ <version>5.48.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 40793dbfa9..f889edc266 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.48.1</version>
+ <version>5.48.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 2abb1ac8d4..56694c941a 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.48.1</version>
+ <version>5.48.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
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 8ae0fae974..6b724ff456 100644
--- a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
+++ b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -772,13 +772,13 @@ abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
}
$defaultSort = $this->display['settings']['sort'] ?? [];
- $currentSort = $this->sort;
+ $currentSort = [];
- // Verify requested sort corresponds to sortable columns
+ // Add requested sort after verifying it corresponds to sortable columns
foreach ($this->sort as $item) {
$column = array_column($this->display['settings']['columns'], NULL, 'key')[$item[0]] ?? NULL;
- if (!$column || (isset($column['sortable']) && !$column['sortable'])) {
- $currentSort = NULL;
+ if ($column && !(isset($column['sortable']) && !$column['sortable'])) {
+ $currentSort[] = $item;
}
}
@@ -788,6 +788,10 @@ abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
if ($item[0] === 'RAND()' && isset($this->seed)) {
$item[0] = 'RAND(' . $this->seed . ')';
}
+ // Prevent errors trying to orderBy nonaggregated columns when using groupBy
+ if ($this->canAggregate($item[0])) {
+ continue;
+ }
$orderBy[$item[0]] = $item[1];
}
return $orderBy;
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index feafa9089c..b219e1fbc4 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.48.1</version>
+ <version>5.48.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php b/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
index 02fda6f709..ae94fc412a 100644
--- a/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
+++ b/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
@@ -954,4 +954,43 @@ class SearchRunTest extends \PHPUnit\Framework\TestCase implements HeadlessInter
$this->assertEquals('Contact', $result[0]['columns'][0]['val']);
}
+ public function testGroupByContactType(): void {
+ $source = uniqid(__FUNCTION__);
+ $sampleData = [
+ ['contact_type' => 'Individual'],
+ ['contact_type' => 'Individual'],
+ ['contact_type' => 'Individual'],
+ ['contact_type' => 'Organization'],
+ ['contact_type' => 'Organization'],
+ ['contact_type' => 'Household'],
+ ];
+ Contact::save(FALSE)
+ ->addDefault('source', $source)
+ ->setRecords($sampleData)
+ ->execute();
+
+ $params = [
+ 'checkPermissions' => FALSE,
+ 'return' => 'page:1',
+ 'savedSearch' => [
+ 'api_entity' => 'Contact',
+ 'api_params' => [
+ 'version' => 4,
+ 'select' => ['contact_type:label', 'COUNT(id) AS COUNT_id'],
+ 'where' => [['source', '=', $source]],
+ 'groupBy' => ['contact_type'],
+ ],
+ ],
+ 'display' => NULL,
+ 'afform' => NULL,
+ ];
+
+ $result = civicrm_api4('SearchDisplay', 'run', $params);
+ $this->assertCount(3, $result);
+ $data = array_column(array_column((array) $result, 'data'), 'COUNT_id', 'contact_type:label');
+ $this->assertEquals(3, $data['Individual']);
+ $this->assertEquals(2, $data['Organization']);
+ $this->assertEquals(1, $data['Household']);
+ }
+
}
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 33d4cd30ca..106480275a 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.48.1</version>
+ <version>5.48.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index ab712bba33..a8e8576bec 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.48.2
+
+Released April 20, 2022
+
+- **[Synopsis](release-notes/5.48.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.48.2.md#bugs)**
+- **[Credits](release-notes/5.48.2.md#credits)**
+- **[Feedback](release-notes/5.48.2.md#feedback)**
+
## CiviCRM 5.48.1
Released April 12, 2022
diff --git a/civicrm/release-notes/5.48.2.md b/civicrm/release-notes/5.48.2.md
new file mode 100644
index 0000000000..5913966c6e
--- /dev/null
+++ b/civicrm/release-notes/5.48.2.md
@@ -0,0 +1,42 @@
+# CiviCRM 5.48.2
+
+Released April 20, 2022
+
+- **[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** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: Fix SQL error when interpreting ACL ([#23235](https://github.com/civicrm/civicrm-core/pull/23235))**
+* **_CiviContribute_: Fix buttons on bottom of "View Contribution" dialog ([#23202](https://github.com/civicrm/civicrm-core/pull/23202))**
+* **_CiviContribute_: Fix "Download Invoice" button ([dev/core#3168](https://lab.civicrm.org/dev/core/-/issues/3168): [#23255](https://github.com/civicrm/civicrm-core/pull/23255))**
+* **_CiviMember_: Fix malformed query when user has no access to any financial ACLs ([#23228](https://github.com/civicrm/civicrm-core/pull/23228))**
+* **_Relationships_: Restore support for "Employer" relationships with "Individual" employers ([dev/core#3182](https://lab.civicrm.org/dev/core/-/issues/3182): [#23226](https://github.com/civicrm/civicrm-core/pull/23226))**
+* **_Search Kit_: Prevent error when sorting on a non-aggregated column ([#23247](https://github.com/civicrm/civicrm-core/pull/23247))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Phil McKerracher; Megaphone Technology
+Consulting - Jon Goldberg; JMA Consulting - Seamus Lee; CiviDesk - Yashodha Chaku; Dave D;
+CiviCRM - Coleman Watts, Tim Otten
+
+## <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 2998f1109e..c326a68bd1 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23788,4 +23788,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.48.1';
+UPDATE civicrm_domain SET version = '5.48.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index f9a1272c95..814bd3606e 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2935,7 +2935,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.48.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.48.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/Form/PaymentInfoBlock.tpl b/civicrm/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl
index bcb23f9a56..b08f74aa39 100644
--- a/civicrm/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl
@@ -41,7 +41,7 @@
{/if}
{foreach from=$paymentLinks item=paymentLink}
- <a class="open-inline action-item crm-hover-button" href="{$paymentLink.url}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}{$paymentLink.title}{/ts}</a>
+ <a class="open-inline action-item crm-hover-button" href="{crmURL p=$paymentLink.url q=$paymentLink.qs}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}{$paymentLink.title}{/ts}</a>
{/foreach}
{/crmRegion}
diff --git a/civicrm/templates/CRM/common/formButtons.tpl b/civicrm/templates/CRM/common/formButtons.tpl
index 0652d10b45..649739f574 100644
--- a/civicrm/templates/CRM/common/formButtons.tpl
+++ b/civicrm/templates/CRM/common/formButtons.tpl
@@ -24,7 +24,7 @@
{capture assign=linkname}name="{$linkButton.ref}"{/capture}
{else}{capture assign=linkname}name="{$linkButton.name}"{/capture}
{/if}
- <a class="button" {$linkname} href="{crmURL p=$linkButton.url q=$linkButton.qs}" {$accessKey} {$linkButton.extra}><span>{$icon|smarty:nodefaults}{$linkButton.title}</span></a>
+ <a class="button{if array_key_exists('class', $linkButton)} {$linkButton.class}{/if}" {$linkname} href="{crmURL p=$linkButton.url q=$linkButton.qs}" {$accessKey} {$linkButton.extra}><span>{$icon|smarty:nodefaults}{$linkButton.title}</span></a>
{/foreach}
{/if}
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index bd8ce44a8b..b949683811 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa::getLoader();
+return ComposerAutoloaderInit3ec876b9b2d9ca81ef98f97191ad72ab::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 122a1b57ba..a152c05fbf 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 ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa
+class ComposerAutoloaderInit3ec876b9b2d9ca81ef98f97191ad72ab
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit3ec876b9b2d9ca81ef98f97191ad72ab', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit3ec876b9b2d9ca81ef98f97191ad72ab', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit3ec876b9b2d9ca81ef98f97191ad72ab::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit3ec876b9b2d9ca81ef98f97191ad72ab::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire7a316bdbc578f1efa498d484cb6331fa($fileIdentifier, $file);
+ composerRequire3ec876b9b2d9ca81ef98f97191ad72ab($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire7a316bdbc578f1efa498d484cb6331fa($fileIdentifier, $file)
+function composerRequire3ec876b9b2d9ca81ef98f97191ad72ab($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 64e74022eb..d598d2c545 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa
+class ComposerStaticInit3ec876b9b2d9ca81ef98f97191ad72ab
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -670,11 +670,11 @@ class ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit3ec876b9b2d9ca81ef98f97191ad72ab::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit3ec876b9b2d9ca81ef98f97191ad72ab::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit3ec876b9b2d9ca81ef98f97191ad72ab::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit3ec876b9b2d9ca81ef98f97191ad72ab::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit3ec876b9b2d9ca81ef98f97191ad72ab::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index a24c89ec17..e42815c298 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.48.1</version_no>
+ <version_no>5.48.2</version_no>
</version>
--
GitLab