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

dev/core#2666 - (Alternate) Don't repeatedly log about crm-l10n.js during upgrade
civicrm · Jul 18, 2021 · 07be8ef · 07be8ef
2 parents f93f03f + 89689b3
commit 07be8ef
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
@@ -205,18 +205,20 @@ protected static function coreResourceList($region) {
     ];
 
     // 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')) {