diff --git a/civicrm.php b/civicrm.php
index 5d1338f0b43cca6c28178cff3f047ef851dc02bd..afda81f2c6b87d8bf7f2774e4a3f31b165df3ce1 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.48.0
+ * Version: 5.48.1
* 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.0');
+define('CIVICRM_PLUGIN_VERSION', '5.48.1');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Core/BAO/OptionValue.php b/civicrm/CRM/Core/BAO/OptionValue.php
index 0214ca3072b40739f0b1a2eca32dc873433c2e2f..bb49356d77b4accb56d544633f382e5ed6e2d82f 100644
--- a/civicrm/CRM/Core/BAO/OptionValue.php
+++ b/civicrm/CRM/Core/BAO/OptionValue.php
@@ -155,6 +155,9 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue {
$params['option_group_id'], 'name', 'id'
);
+ $op = $id ? 'edit' : 'create';
+ CRM_Utils_Hook::pre($op, 'OptionValue', $id, $params);
+
// action is taken depending upon the mode
$optionValue = new CRM_Core_DAO_OptionValue();
$optionValue->copyValues($params);
@@ -218,6 +221,8 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue {
$optionValue->save();
CRM_Core_PseudoConstant::flush();
+ CRM_Utils_Hook::post($op, 'OptionValue', $id, $optionValue);
+
// Create relationship for payment instrument options
if (!empty($params['financial_account_id'])) {
$optionName = civicrm_api3('OptionGroup', 'getvalue', [
diff --git a/civicrm/CRM/Export/BAO/ExportProcessor.php b/civicrm/CRM/Export/BAO/ExportProcessor.php
index 4e85f9758c6aba9f0b2d59fe4b31e69dc75ce56b..18a5663ff8d6180c75840ad2a1dcb7b22a1d20b7 100644
--- a/civicrm/CRM/Export/BAO/ExportProcessor.php
+++ b/civicrm/CRM/Export/BAO/ExportProcessor.php
@@ -1464,6 +1464,16 @@ class CRM_Export_BAO_ExportProcessor {
case CRM_Utils_Type::T_STRING:
if (isset($fieldSpec['maxlength'])) {
+ // A localized string for the preferred_mail_format does not fit
+ // into the varchar(8) field.
+ // @see https://lab.civicrm.org/dev/core/-/issues/2645
+ switch ($fieldName) {
+ case 'preferred_mail_format':
+ return "`$fieldName` text(16)";
+
+ default:
+ return "`$fieldName` varchar({$fieldSpec['maxlength']})";
+ }
}
$dataType = $fieldSpec['data_type'] ?? '';
// set the sql columns for custom data
diff --git a/civicrm/CRM/Mailing/BAO/Mailing.php b/civicrm/CRM/Mailing/BAO/Mailing.php
index 5b59f5329458f11341456db35d2a4f3e83d77079..83ddc6dad59b48c9958eecef7970609df8416c4e 100644
--- a/civicrm/CRM/Mailing/BAO/Mailing.php
+++ b/civicrm/CRM/Mailing/BAO/Mailing.php
@@ -1654,12 +1654,22 @@ ORDER BY civicrm_email.is_bulkmail DESC
/**
* @deprecated
* This is used by CiviMail but will be made redundant by FlexMailer.
- * @param CRM_Mailing_DAO_Mailing $mailing
+ * @param CRM_Mailing_DAO_Mailing|array $mailing
* The mailing which may or may not be sendable.
* @return array
* List of error messages.
*/
public static function checkSendable($mailing) {
+ if (is_array($mailing)) {
+ $params = $mailing;
+ $mailing = new \CRM_Mailing_BAO_Mailing();
+ $mailing->id = $params['id'] ?? NULL;
+ if ($mailing->id) {
+ $mailing->find(TRUE);
+ }
+ $mailing->copyValues($params);
+ }
+
$errors = [];
foreach (['subject', 'name', 'from_name', 'from_email'] as $field) {
if (empty($mailing->{$field})) {
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveFortySeven.php b/civicrm/CRM/Upgrade/Incremental/php/FiveFortySeven.php
index 758527ece2afd64701fa8e58b1dc7b516c6ac842..7fcf0bfcc81aeb21a0b9630d415196a5ede39d82 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FiveFortySeven.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FiveFortySeven.php
@@ -130,95 +130,6 @@ class CRM_Upgrade_Incremental_php_FiveFortySeven extends CRM_Upgrade_Incremental
CRM_Extension_System::singleton()->getManager()->refresh();
$managedItems = [
- 'OptionGroup_advanced_search_options_OptionValue_CiviGrant' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'advanced_search_options',
- 'name' => 'CiviGrant',
- ],
- ],
- 'OptionGroup_mapping_type_OptionValue_Export Grant' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'mapping_type',
- 'name' => 'Export Grant',
- ],
- ],
- 'OptionGroup_grant_status' => [
- 'entity' => 'OptionGroup',
- 'values' => [
- 'name' => 'grant_status',
- ],
- ],
- 'OptionGroup_grant_status_OptionValue_Submitted' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'grant_status',
- 'name' => 'Submitted',
- ],
- ],
- 'OptionGroup_grant_status_OptionValue_Eligible' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'grant_status',
- 'name' => 'Eligible',
- ],
- ],
- 'OptionGroup_grant_status_OptionValue_Ineligible' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'grant_status',
- 'name' => 'Ineligible',
- ],
- ],
- 'OptionGroup_grant_status_OptionValue_Paid' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'grant_status',
- 'name' => 'Paid',
- ],
- ],
- 'OptionGroup_grant_status_OptionValue_Awaiting Information' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'grant_status',
- 'name' => 'Awaiting Information',
- ],
- ],
- 'OptionGroup_grant_status_OptionValue_Withdrawn' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'grant_status',
- 'name' => 'Withdrawn',
- ],
- ],
- 'OptionGroup_grant_status_OptionValue_Approved for Payment' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'grant_status',
- 'name' => 'Approved for Payment',
- ],
- ],
- 'OptionGroup_grant_type' => [
- 'entity' => 'OptionGroup',
- 'values' => [
- 'name' => 'grant_type',
- ],
- ],
- 'OptionGroup_report_template_OptionValue_CRM_Report_Form_Grant_Detail' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'report_template',
- 'name' => 'CRM_Report_Form_Grant_Detail',
- ],
- ],
- 'OptionGroup_report_template_OptionValue_CRM_Report_Form_Grant_Statistics' => [
- 'entity' => 'OptionValue',
- 'values' => [
- 'option_group_id:name' => 'report_template',
- 'name' => 'CRM_Report_Form_Grant_Statistics',
- ],
- ],
'Navigation_Grants' => [
'entity' => 'Navigation',
'values' => [
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.48.1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.48.1.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..ba9e2dc4e7226d3a74e8cef54669fa592153a43e
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.48.1.mysql.tpl
@@ -0,0 +1,4 @@
+{* file to handle db changes in 5.48.1 during upgrade *}
+
+DELETE FROM civicrm_managed WHERE module = "civigrant" AND entity_type = "OptionValue"
+AND name LIKE "OptionGroup_grant_status_%";
diff --git a/civicrm/Civi/Core/Container.php b/civicrm/Civi/Core/Container.php
index c7573f0d0934b074592b14b274963ae4d73cf08e..3bedf7f2355f3a5ae2c133c8212bd2addd77c42f 100644
--- a/civicrm/Civi/Core/Container.php
+++ b/civicrm/Civi/Core/Container.php
@@ -168,9 +168,11 @@ class Container {
'contactTypes' => 'contactTypes',
'metadata' => 'metadata',
];
+ $verSuffixCaches = ['metadata'];
+ $verSuffix = '_' . preg_replace(';[^0-9a-z_];', '_', \CRM_Utils_System::version());
foreach ($basicCaches as $cacheSvc => $cacheGrp) {
$definitionParams = [
- 'name' => $cacheGrp,
+ 'name' => $cacheGrp . (in_array($cacheGrp, $verSuffixCaches) ? $verSuffix : ''),
'type' => ['*memory*', 'SqlGroup', 'ArrayCache'],
];
// For Caches that we don't really care about the ttl for and/or maybe accessed
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 24a65aa4a0f18f9f59c46e92a1df2e9909db53bb..41ba61c14aebf8e30de97c17bdaa44e954d2d294 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.48.0',
+ return array( 'version' => '5.48.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 618a40a7afdaa985fb6319694951c14f665ed677..971c7e3eec86d63ea465dc84805d893eb2df0b81 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.0</version>
+ <version>5.48.1</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 73a8f77b10f3fb2d8cc35698bb9cc312f0b0cebe..d3d82d4adcf0478d44bf9a7cb06317eeee6dccda 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.0</version>
+ <version>5.48.1</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 8e905b513b56f0dbf7381ccc80f56480b09d4390..a9ccac23e93a30e7dcf960cbda5332e79cb5eccc 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.0</version>
+ <version>5.48.1</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 73edc01e8ff6e603270126222c5e9e681e4e74c5..cfccd6602551b0bdfe530578129dbe847bfb3937 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.0</version>
+ <version>5.48.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 1df83aa06dfb557f9a6bd5bd6388c50f059a95fa..0b9a4312cf04a5579b02808b3304262bb217d07f 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.0</version>
+ <version>5.48.1</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 5ada80c76e6639d5c85a1273a1cdb0e5f674377e..9955a51d17c2e2f8661efe8a3e85eedf2549e9db 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.0</version>
+ <version>5.48.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.47</ver>
diff --git a/civicrm/ext/civigrant/CRM/Grant/Upgrader.php b/civicrm/ext/civigrant/CRM/Grant/Upgrader.php
index 1798462a98414c2744b85fbc044f29c9a9f6b19c..e6e188e32ad8a3307f0864e611142ea31c4c3ca2 100644
--- a/civicrm/ext/civigrant/CRM/Grant/Upgrader.php
+++ b/civicrm/ext/civigrant/CRM/Grant/Upgrader.php
@@ -6,4 +6,33 @@ use CRM_Grant_ExtensionUtil as E;
*/
class CRM_Grant_Upgrader extends CRM_Extension_Upgrader_Base {
+ public function install() {
+ // Ensure option group exists (in case OptionGroup_grant_status.mgd.php hasn't loaded yet)
+ \Civi\Api4\OptionGroup::save(FALSE)
+ ->addRecord([
+ 'name' => 'grant_status',
+ 'title' => E::ts('Grant status'),
+ ])
+ ->setMatch(['name'])
+ ->execute();
+
+ // Create unmanaged option values. They will not be updated by the system ever,
+ // but they will be deleted on uninstall because the option group is a managed entity.
+ \Civi\Api4\OptionValue::save(FALSE)
+ ->setDefaults([
+ 'option_group_id.name' => 'grant_status',
+ ])
+ ->setRecords([
+ ['value' => 1, 'name' => 'Submitted', 'label' => E::ts('Submitted'), 'is_default' => TRUE],
+ ['value' => 2, 'name' => 'Eligible', 'label' => E::ts('Eligible')],
+ ['value' => 3, 'name' => 'Ineligible', 'label' => E::ts('Ineligible')],
+ ['value' => 4, 'name' => 'Paid', 'label' => E::ts('Paid')],
+ ['value' => 5, 'name' => 'Awaiting Information', 'label' => E::ts('Awaiting Information')],
+ ['value' => 6, 'name' => 'Withdrawn', 'label' => E::ts('Withdrawn')],
+ ['value' => 7, 'name' => 'Approved for Payment', 'label' => E::ts('Approved for Payment')],
+ ])
+ ->setMatch(['option_group_id', 'name'])
+ ->execute();
+ }
+
}
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 275ed7a6d51766cc3fb90e72564ade4064380bbb..07910abd5ecbde937536955b35efa8c2b3873239 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.0</version>
+ <version>5.48.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.47</ver>
diff --git a/civicrm/ext/civigrant/managed/Navigation_Grants.mgd.php b/civicrm/ext/civigrant/managed/Navigation_Grants.mgd.php
index 6191e7c3a8b73702251a529abda706f6e4f2553e..d69029d4e5b0dcb5dc076c2c16971c177c061491 100644
--- a/civicrm/ext/civigrant/managed/Navigation_Grants.mgd.php
+++ b/civicrm/ext/civigrant/managed/Navigation_Grants.mgd.php
@@ -1,14 +1,16 @@
<?php
+use CRM_Grant_ExtensionUtil as E;
+
return [
[
'name' => 'Navigation_Grants',
'entity' => 'Navigation',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
- 'label' => 'Grants',
+ 'label' => E::ts('Grants'),
'name' => 'Grants',
'url' => NULL,
'icon' => 'crm-i fa-money',
@@ -25,12 +27,12 @@ return [
[
'name' => 'Navigation_Grants_Navigation_Dashboard',
'entity' => 'Navigation',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
- 'label' => 'Dashboard',
+ 'label' => E::ts('Dashboard'),
'name' => 'Dashboard',
'url' => 'civicrm/grant?reset=1',
'icon' => NULL,
@@ -46,12 +48,12 @@ return [
[
'name' => 'Navigation_Grants_Navigation_New_Grant',
'entity' => 'Navigation',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
- 'label' => 'New Grant',
+ 'label' => E::ts('New Grant'),
'name' => 'New Grant',
'url' => 'civicrm/grant/add?reset=1&action=add&context=standalone',
'icon' => NULL,
@@ -67,12 +69,12 @@ return [
[
'name' => 'Navigation_Grants_Navigation_Find_Grants',
'entity' => 'Navigation',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
- 'label' => 'Find Grants',
+ 'label' => E::ts('Find Grants'),
'name' => 'Find Grants',
'url' => 'civicrm/grant/search?reset=1',
'icon' => NULL,
@@ -88,12 +90,12 @@ return [
[
'name' => 'Navigation_CiviGrant',
'entity' => 'Navigation',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
- 'label' => 'CiviGrant',
+ 'label' => E::ts('CiviGrant'),
'name' => 'CiviGrant',
'url' => NULL,
'icon' => NULL,
@@ -110,12 +112,12 @@ return [
[
'name' => 'Navigation_CiviGrant_Navigation_Grant_Types',
'entity' => 'Navigation',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
- 'label' => 'Grant Types',
+ 'label' => E::ts('Grant Types'),
'name' => 'Grant Types',
'url' => 'civicrm/admin/options/grant_type?reset=1',
'icon' => NULL,
@@ -132,12 +134,12 @@ return [
[
'name' => 'Navigation_CiviGrant_Navigation_Grant_Status',
'entity' => 'Navigation',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
- 'label' => 'Grant Status',
+ 'label' => E::ts('Grant Status'),
'name' => 'Grant Status',
'url' => 'civicrm/admin/options/grant_status?reset=1',
'icon' => NULL,
diff --git a/civicrm/ext/civigrant/managed/OptionGroup_advanced_search_options_OptionValue_CiviGrant.mgd.php b/civicrm/ext/civigrant/managed/OptionGroup_advanced_search_options_OptionValue_CiviGrant.mgd.php
index 757d2d93424d45e0ea528fa549a6b4444daf5498..647b30f798713f4670e6065af88e74a943512b9a 100644
--- a/civicrm/ext/civigrant/managed/OptionGroup_advanced_search_options_OptionValue_CiviGrant.mgd.php
+++ b/civicrm/ext/civigrant/managed/OptionGroup_advanced_search_options_OptionValue_CiviGrant.mgd.php
@@ -1,15 +1,17 @@
<?php
+use CRM_Grant_ExtensionUtil as E;
+
return [
[
'name' => 'OptionGroup_advanced_search_options_OptionValue_CiviGrant',
'entity' => 'OptionValue',
- 'cleanup' => 'unused',
- 'update' => 'unmodified',
+ 'cleanup' => 'always',
+ 'update' => 'always',
'params' => [
'version' => 4,
'values' => [
'option_group_id.name' => 'advanced_search_options',
- 'label' => 'Grants',
+ 'label' => E::ts('Grants'),
'value' => '12',
'name' => 'CiviGrant',
'grouping' => NULL,
@@ -26,6 +28,7 @@ return [
'domain_id' => NULL,
'visibility_id' => NULL,
],
+ 'match' => ['option_group_id', 'name'],
],
],
];
diff --git a/civicrm/ext/civigrant/managed/OptionGroup_grant_status.mgd.php b/civicrm/ext/civigrant/managed/OptionGroup_grant_status.mgd.php
index 2ebab03245301cfc92216a891d0567a7d6f30a77..c040a7187c52d21f80ee70db234d38811b32a320 100644
--- a/civicrm/ext/civigrant/managed/OptionGroup_grant_status.mgd.php
+++ b/civicrm/ext/civigrant/managed/OptionGroup_grant_status.mgd.php
@@ -1,217 +1,24 @@
<?php
+use CRM_Grant_ExtensionUtil as E;
+
return [
[
'name' => 'OptionGroup_grant_status',
'entity' => 'OptionGroup',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
'name' => 'grant_status',
- 'title' => 'Grant status',
+ 'title' => E::ts('Grant status'),
'description' => NULL,
'data_type' => NULL,
'is_reserved' => TRUE,
'is_active' => TRUE,
'is_locked' => FALSE,
],
- ],
- ],
- [
- 'name' => 'OptionGroup_grant_status_OptionValue_Submitted',
- 'entity' => 'OptionValue',
- 'cleanup' => 'unused',
- 'update' => 'unmodified',
- 'params' => [
- 'version' => 4,
- 'values' => [
- 'option_group_id.name' => 'grant_status',
- 'label' => 'Submitted',
- 'value' => '1',
- 'name' => 'Submitted',
- 'grouping' => NULL,
- 'filter' => 0,
- 'is_default' => TRUE,
- 'weight' => 1,
- 'description' => NULL,
- 'is_optgroup' => FALSE,
- 'is_reserved' => FALSE,
- 'is_active' => TRUE,
- 'icon' => NULL,
- 'color' => NULL,
- 'component_id' => NULL,
- 'domain_id' => NULL,
- 'visibility_id' => NULL,
- ],
- ],
- ],
- [
- 'name' => 'OptionGroup_grant_status_OptionValue_Eligible',
- 'entity' => 'OptionValue',
- 'cleanup' => 'unused',
- 'update' => 'unmodified',
- 'params' => [
- 'version' => 4,
- 'values' => [
- 'option_group_id.name' => 'grant_status',
- 'label' => 'Eligible',
- 'value' => '2',
- 'name' => 'Eligible',
- 'grouping' => NULL,
- 'filter' => 0,
- 'is_default' => FALSE,
- 'weight' => 2,
- 'description' => NULL,
- 'is_optgroup' => FALSE,
- 'is_reserved' => FALSE,
- 'is_active' => TRUE,
- 'icon' => NULL,
- 'color' => NULL,
- 'component_id' => NULL,
- 'domain_id' => NULL,
- 'visibility_id' => NULL,
- ],
- ],
- ],
- [
- 'name' => 'OptionGroup_grant_status_OptionValue_Ineligible',
- 'entity' => 'OptionValue',
- 'cleanup' => 'unused',
- 'update' => 'unmodified',
- 'params' => [
- 'version' => 4,
- 'values' => [
- 'option_group_id.name' => 'grant_status',
- 'label' => 'Ineligible',
- 'value' => '3',
- 'name' => 'Ineligible',
- 'grouping' => NULL,
- 'filter' => 0,
- 'is_default' => FALSE,
- 'weight' => 3,
- 'description' => NULL,
- 'is_optgroup' => FALSE,
- 'is_reserved' => FALSE,
- 'is_active' => TRUE,
- 'icon' => NULL,
- 'color' => NULL,
- 'component_id' => NULL,
- 'domain_id' => NULL,
- 'visibility_id' => NULL,
- ],
- ],
- ],
- [
- 'name' => 'OptionGroup_grant_status_OptionValue_Paid',
- 'entity' => 'OptionValue',
- 'cleanup' => 'unused',
- 'update' => 'unmodified',
- 'params' => [
- 'version' => 4,
- 'values' => [
- 'option_group_id.name' => 'grant_status',
- 'label' => 'Paid',
- 'value' => '4',
- 'name' => 'Paid',
- 'grouping' => NULL,
- 'filter' => 0,
- 'is_default' => FALSE,
- 'weight' => 4,
- 'description' => NULL,
- 'is_optgroup' => FALSE,
- 'is_reserved' => FALSE,
- 'is_active' => TRUE,
- 'icon' => NULL,
- 'color' => NULL,
- 'component_id' => NULL,
- 'domain_id' => NULL,
- 'visibility_id' => NULL,
- ],
- ],
- ],
- [
- 'name' => 'OptionGroup_grant_status_OptionValue_Awaiting Information',
- 'entity' => 'OptionValue',
- 'cleanup' => 'unused',
- 'update' => 'unmodified',
- 'params' => [
- 'version' => 4,
- 'values' => [
- 'option_group_id.name' => 'grant_status',
- 'label' => 'Awaiting Information',
- 'value' => '5',
- 'name' => 'Awaiting Information',
- 'grouping' => NULL,
- 'filter' => 0,
- 'is_default' => FALSE,
- 'weight' => 5,
- 'description' => NULL,
- 'is_optgroup' => FALSE,
- 'is_reserved' => FALSE,
- 'is_active' => TRUE,
- 'icon' => NULL,
- 'color' => NULL,
- 'component_id' => NULL,
- 'domain_id' => NULL,
- 'visibility_id' => NULL,
- ],
- ],
- ],
- [
- 'name' => 'OptionGroup_grant_status_OptionValue_Withdrawn',
- 'entity' => 'OptionValue',
- 'cleanup' => 'unused',
- 'update' => 'unmodified',
- 'params' => [
- 'version' => 4,
- 'values' => [
- 'option_group_id.name' => 'grant_status',
- 'label' => 'Withdrawn',
- 'value' => '6',
- 'name' => 'Withdrawn',
- 'grouping' => NULL,
- 'filter' => 0,
- 'is_default' => FALSE,
- 'weight' => 6,
- 'description' => NULL,
- 'is_optgroup' => FALSE,
- 'is_reserved' => FALSE,
- 'is_active' => TRUE,
- 'icon' => NULL,
- 'color' => NULL,
- 'component_id' => NULL,
- 'domain_id' => NULL,
- 'visibility_id' => NULL,
- ],
- ],
- ],
- [
- 'name' => 'OptionGroup_grant_status_OptionValue_Approved for Payment',
- 'entity' => 'OptionValue',
- 'cleanup' => 'unused',
- 'update' => 'unmodified',
- 'params' => [
- 'version' => 4,
- 'values' => [
- 'option_group_id.name' => 'grant_status',
- 'label' => 'Approved for Payment',
- 'value' => '7',
- 'name' => 'Approved for Payment',
- 'grouping' => NULL,
- 'filter' => 0,
- 'is_default' => FALSE,
- 'weight' => 7,
- 'description' => NULL,
- 'is_optgroup' => FALSE,
- 'is_reserved' => FALSE,
- 'is_active' => TRUE,
- 'icon' => NULL,
- 'color' => NULL,
- 'component_id' => NULL,
- 'domain_id' => NULL,
- 'visibility_id' => NULL,
- ],
+ 'match' => ['name'],
],
],
];
diff --git a/civicrm/ext/civigrant/managed/OptionGroup_grant_type.mgd.php b/civicrm/ext/civigrant/managed/OptionGroup_grant_type.mgd.php
index 4f1ccf826bea4044f872f147a743c5d07ab01278..ade40dbd79ec02585ce543d764757e1153509f60 100644
--- a/civicrm/ext/civigrant/managed/OptionGroup_grant_type.mgd.php
+++ b/civicrm/ext/civigrant/managed/OptionGroup_grant_type.mgd.php
@@ -1,9 +1,11 @@
<?php
+use CRM_Grant_ExtensionUtil as E;
+
return [
[
'name' => 'OptionGroup_grant_type',
'entity' => 'OptionGroup',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
@@ -16,6 +18,7 @@ return [
'is_active' => TRUE,
'is_locked' => FALSE,
],
+ 'match' => ['name'],
],
],
];
diff --git a/civicrm/ext/civigrant/managed/OptionGroup_mapping_type_OptionValue_Export.mgd.php b/civicrm/ext/civigrant/managed/OptionGroup_mapping_type_OptionValue_Export.mgd.php
index 33532b150c2500d8f96f6372a58c9c8d198a54aa..b1e605cb9e6ecfd2c63d2a1f73e011395eaaa286 100644
--- a/civicrm/ext/civigrant/managed/OptionGroup_mapping_type_OptionValue_Export.mgd.php
+++ b/civicrm/ext/civigrant/managed/OptionGroup_mapping_type_OptionValue_Export.mgd.php
@@ -1,15 +1,17 @@
<?php
+use CRM_Grant_ExtensionUtil as E;
+
return [
[
'name' => 'OptionGroup_mapping_type_OptionValue_Export Grant',
'entity' => 'OptionValue',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
'option_group_id.name' => 'mapping_type',
- 'label' => 'Export Grant',
+ 'label' => E::ts('Export Grant'),
'value' => '13',
'name' => 'Export Grant',
'grouping' => NULL,
@@ -26,6 +28,7 @@ return [
'domain_id' => NULL,
'visibility_id' => NULL,
],
+ 'match' => ['option_group_id', 'name'],
],
],
];
diff --git a/civicrm/ext/civigrant/managed/OptionGroup_report_template_OptionValue_CRM_Report_Form_Grants.mgd.php b/civicrm/ext/civigrant/managed/OptionGroup_report_template_OptionValue_CRM_Report_Form_Grants.mgd.php
index ed7a5367e4e6cf5a08df688216453e2f8cfa0345..8a6141da441bc9169a5eb5ecad40679045a248f7 100644
--- a/civicrm/ext/civigrant/managed/OptionGroup_report_template_OptionValue_CRM_Report_Form_Grants.mgd.php
+++ b/civicrm/ext/civigrant/managed/OptionGroup_report_template_OptionValue_CRM_Report_Form_Grants.mgd.php
@@ -1,4 +1,6 @@
<?php
+use CRM_Grant_ExtensionUtil as E;
+
return [
[
'name' => 'OptionGroup_report_template_OptionValue_CRM_Report_Form_Grant_Detail',
@@ -9,7 +11,7 @@ return [
'version' => 4,
'values' => [
'option_group_id.name' => 'report_template',
- 'label' => 'Grant Report (Detail)',
+ 'label' => E::ts('Grant Report (Detail)'),
'value' => 'grant/detail',
'name' => 'CRM_Report_Form_Grant_Detail',
'grouping' => NULL,
@@ -26,6 +28,7 @@ return [
'domain_id' => NULL,
'visibility_id' => NULL,
],
+ 'match' => ['name'],
],
],
[
@@ -37,7 +40,7 @@ return [
'version' => 4,
'values' => [
'option_group_id.name' => 'report_template',
- 'label' => 'Grant Report (Statistics)',
+ 'label' => E::ts('Grant Report (Statistics)'),
'value' => 'grant/statistics',
'name' => 'CRM_Report_Form_Grant_Statistics',
'grouping' => NULL,
@@ -54,6 +57,7 @@ return [
'domain_id' => NULL,
'visibility_id' => NULL,
],
+ 'match' => ['option_group_id', 'name'],
],
],
];
diff --git a/civicrm/ext/civigrant/managed/SavedSearch_CiviGrant_Summary.mgd.php b/civicrm/ext/civigrant/managed/SavedSearch_CiviGrant_Summary.mgd.php
index c4ba425b3b12d35029f5040c1f30afaa50df9a3b..e182af1bba30434dbfa7b7e6f784f97451992773 100644
--- a/civicrm/ext/civigrant/managed/SavedSearch_CiviGrant_Summary.mgd.php
+++ b/civicrm/ext/civigrant/managed/SavedSearch_CiviGrant_Summary.mgd.php
@@ -5,7 +5,7 @@ return [
[
'name' => 'SavedSearch_CiviGrant_Summary',
'entity' => 'SavedSearch',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
@@ -41,7 +41,7 @@ return [
[
'name' => 'SavedSearch_CiviGrant_Summary_SearchDisplay_Grant_Tab',
'entity' => 'SearchDisplay',
- 'cleanup' => 'unused',
+ 'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index a0e99aa000b82ad4b27233404f26c502b4208d6f..07302913a5f65f0e4a0e3563819d015b704b3b95 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.0</version>
+ <version>5.48.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.39</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 95549c016714712c16fe8da6fc8be6c6b35a9e9f..51419f994dceb7b5876487f74783107d0e10fbd9 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.0</version>
+ <version>5.48.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.32</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 7a97d8714d3df0b2d68c140d8dfb0dc79d367696..fd4a37e3708b0f38b8a147f4cd06526be1cb5fa7 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.0</version>
+ <version>5.48.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index f0cac1a47309748465d2474b60a3146d570cb0d3..3b85d6952d3b919adc2aae4d3cbdd86e3bcc446e 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.0</version>
+ <version>5.48.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 60a2f86a2f18f39aa280bad97bee162e8be8a480..7ab1cc44f296a44abbc96be9bc8cf25e7c03189a 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.0</version>
+ <version>5.48.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.30</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index fcfe66218161dfc177cfbf00fbb1aab047eaf395..8620da21c17310f1fe6820e72ac36c28fde1272d 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.0</version>
+ <version>5.48.1</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 11a4f2e6f6882bf9421441021f750469136a4a44..454c45a0a8c5333ea46a263216df62379ec3d2ab 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.0</version>
+ <version>5.48.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 6d3680c450595206f223c40a410197a79a3abc52..a15d0af6adf43956750c6c5876934ee63e58980a 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.0</version>
+ <version>5.48.1</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 d8bd364c79ca8d6a0353df4fd8b3c654f7406947..5645a3e97f737f4a1eb8b8fee3b758689e869d30 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.0</version>
+ <version>5.48.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index 2985003888e5c3b0bae64c4dda33b132df07de73..ad638ca91a5c079d5d3e69c7811208e555351680 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.0</version>
+ <version>5.48.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 43e26750fe1a551a3aa0122b06783d029c8a4049..40793dbfa9c2cdbdf678d6a294992ef298c26d05 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.0</version>
+ <version>5.48.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index a92558efc55e35815eeadd0722940a09e1c39e33..2abb1ac8d4a90e80e01f11b7ccd256c3bf6c8b43 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.0</version>
+ <version>5.48.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 70f0dda7633ac613f9357ed670d99fe731e4c4d3..feafa9089c2d1db8c310dbd0763abfd04dda7cdc 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.0</version>
+ <version>5.48.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index b4cbdbefe43a71b841035ba5a9584e5e3c64abe5..33d4cd30ca1a4d8dbfbbaddb904ea6972b4a935e 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.0</version>
+ <version>5.48.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index db4619bd49549dd544ddedb8b2d9883a04570bb0..ab712bba336f0561dfd2cbbafc17d7c0b67b9b83 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -15,6 +15,14 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 5.48.1
+
+Released April 12, 2022
+
+- **[Synopsis](release-notes/5.48.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.48.1.md#bugs)**
+- **[Credits](release-notes/5.48.1.md#credits)**
+- **[Feedback](release-notes/5.48.1.md#feedback)**
## CiviCRM 5.48.0
diff --git a/civicrm/release-notes/5.48.1.md b/civicrm/release-notes/5.48.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..9bd0c7527682765850b0a33a79b0ad3d360bcbc2
--- /dev/null
+++ b/civicrm/release-notes/5.48.1.md
@@ -0,0 +1,46 @@
+# CiviCRM 5.48.1
+
+Released April 12, 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?** | **yes** |
+| **Fix problems installing or upgrading to a previous version?** | **yes** |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviGrant_: Custom statuses renamed during migration ([dev/core#3161](https://lab.civicrm.org/dev/core/-/issues/3161): [#23130](https://github.com/civicrm/civicrm-core/pull/23130), [#23140](https://github.com/civicrm/civicrm-core/pull/23140))**
+
+ CiviGrant supports configurable statuses ("Administer => CiviGrant => Grant Status"). If one of the _default statuses_ was
+ _modified_, then the status could have reverted to its default name.
+
+ This fix prevents similar problems in new upgrades. However, if you previously used an affected version (5.47.0-5.48.0),
+ then please review the list in "Administer => CiviGrant => Grant Status".
+
+* **_CiviMail_: Fix validation error on sites that do not use Flexmailer ([#23141](https://github.com/civicrm/civicrm-core/pull/23141))**
+* **_Upgrader_: Fix "No such table" error for web-user who navigates toward upgrade screen ([dev/core#3166](https://lab.civicrm.org/dev/core/-/issues/3166): [#23148](https://github.com/civicrm/civicrm-core/pull/23148))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano; Stephen
+Palmstrom; Lighthouse Consulting and Design - Brian Shaughnessy; JMA Consulting - Seamus
+Lee; 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 4af7f37263dd9394fb31892aa71e6b998a35836e..2998f1109edee3f3a26cd82b2b5ce9d184ad376b 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.0';
+UPDATE civicrm_domain SET version = '5.48.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index a15617548bb26896aa90bbf1740b3df972ddaa89..f9a1272c95e711279857feb6800630efabfe5b6f 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.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.48.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 4b2116d708653db9776bf84177ceb98a1ec0f48a..bd8ce44a8b14ec8c549605710e5fd2bea312fda8 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitb59f00d19ce944fce5ab065a94c51420::getLoader();
+return ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 110f82346a5399c09b280253f12bdf033d22abed..122a1b57ba8cc6e837a799b6acb8604165d50b3b 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 ComposerAutoloaderInitb59f00d19ce944fce5ab065a94c51420
+class ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitb59f00d19ce944fce5ab065a94c51420
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitb59f00d19ce944fce5ab065a94c51420', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitb59f00d19ce944fce5ab065a94c51420', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit7a316bdbc578f1efa498d484cb6331fa', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInitb59f00d19ce944fce5ab065a94c51420
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitb59f00d19ce944fce5ab065a94c51420::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInitb59f00d19ce944fce5ab065a94c51420
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitb59f00d19ce944fce5ab065a94c51420::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequireb59f00d19ce944fce5ab065a94c51420($fileIdentifier, $file);
+ composerRequire7a316bdbc578f1efa498d484cb6331fa($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequireb59f00d19ce944fce5ab065a94c51420($fileIdentifier, $file)
+function composerRequire7a316bdbc578f1efa498d484cb6331fa($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 7d11c074bc7ae16372f66bdb2b22b587e3d2096e..64e74022ebad9ee896c40d3835a6e0acb7187b03 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitb59f00d19ce944fce5ab065a94c51420
+class ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -670,11 +670,11 @@ class ComposerStaticInitb59f00d19ce944fce5ab065a94c51420
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitb59f00d19ce944fce5ab065a94c51420::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitb59f00d19ce944fce5ab065a94c51420::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitb59f00d19ce944fce5ab065a94c51420::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInitb59f00d19ce944fce5ab065a94c51420::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInitb59f00d19ce944fce5ab065a94c51420::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit7a316bdbc578f1efa498d484cb6331fa::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 97fe6ee7cf325aad355e33034fe695e1cefac072..a24c89ec1705a2deeb6d0ca887760bd957e1e669 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.0</version_no>
+ <version_no>5.48.1</version_no>
</version>