From 0022fd1b053cbcfcc7636456df43ae6735983d66 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 12 Oct 2020 19:53:27 -0700
Subject: [PATCH] CRM_Mailing_Info - Init Angular data via `settingsFactory`
 instead of `settings`

---
 CRM/Mailing/Info.php   | 3 +--
 ang/crmMailing.ang.php | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index e082599864..e339405c56 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -119,7 +119,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
       'enabledLanguages' => $enabledLanguages,
       'isMultiLingual' => $isMultiLingual,
     ];
-    return ['crmMailing' => $crmMailingSettings];
+    return $crmMailingSettings;
   }
 
   /**
@@ -160,7 +160,6 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     $result['crmD3'] = include "$civicrm_root/ang/crmD3.ang.php";
 
     CRM_Core_Resources::singleton()
-      ->addSetting(self::createAngularSettings())
       ->addPermissions([
         'view all contacts',
         'edit all contacts',
diff --git a/ang/crmMailing.ang.php b/ang/crmMailing.ang.php
index a3e140c605..ebd23e5f7c 100644
--- a/ang/crmMailing.ang.php
+++ b/ang/crmMailing.ang.php
@@ -14,5 +14,6 @@ return [
   ],
   'css' => ['ang/crmMailing.css'],
   'partials' => ['ang/crmMailing'],
+  'settingsFactory' => ['CRM_Mailing_Info', 'createAngularSettings'],
   'requires' => ['crmUtil', 'crmAttachment', 'crmAutosave', 'ngRoute', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'],
 ];
-- 
2.25.1