Skip to content
Snippets Groups Projects
Unverified Commit 07be8ef1 authored by colemanw's avatar colemanw Committed by GitHub
Browse files

Merge pull request #20890 from demeritcowboy/ignore-log-upgrade-alt

#2666 - (Alternate) Don't repeatedly log about crm-l10n.js during upgrade
parents f93f03fb 89689b37
Branches
Tags
No related merge requests found
......@@ -205,18 +205,20 @@ class CRM_Core_Resources_Common {
];
// Dynamic localization script
$items[] = Civi::service('asset_builder')->getUrl('crm-l10n.js', [
'cid' => $contactID,
'includeEmailInName' => (bool) $settings->get('includeEmailInName'),
'ajaxPopupsEnabled' => (bool) $settings->get('ajaxPopupsEnabled'),
'allowAlertAutodismissal' => (bool) $settings->get('allow_alert_autodismissal'),
'resourceCacheCode' => Civi::resources()->getCacheCode(),
'locale' => CRM_Core_I18n::getLocale(),
'lcMessages' => $settings->get('lcMessages'),
'dateInputFormat' => $settings->get('dateInputFormat'),
'timeInputFormat' => $settings->get('timeInputFormat'),
'moneyFormat' => CRM_Utils_Money::format(1234.56),
]);
if (!CRM_Core_Config::isUpgradeMode()) {
$items[] = Civi::service('asset_builder')->getUrl('crm-l10n.js', [
'cid' => $contactID,
'includeEmailInName' => (bool) $settings->get('includeEmailInName'),
'ajaxPopupsEnabled' => (bool) $settings->get('ajaxPopupsEnabled'),
'allowAlertAutodismissal' => (bool) $settings->get('allow_alert_autodismissal'),
'resourceCacheCode' => Civi::resources()->getCacheCode(),
'locale' => CRM_Core_I18n::getLocale(),
'lcMessages' => $settings->get('lcMessages'),
'dateInputFormat' => $settings->get('dateInputFormat'),
'timeInputFormat' => $settings->get('timeInputFormat'),
'moneyFormat' => CRM_Utils_Money::format(1234.56),
]);
}
// These scripts are only needed by back-office users
if (CRM_Core_Permission::check('access CiviCRM')) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment