Merge pull request #22689 from colemanw/removeCiviMailVar
authorEileen McNaughton <emcnaughton@wikimedia.org>
Fri, 25 Mar 2022 02:53:59 +0000 (15:53 +1300)
committerGitHub <noreply@github.com>
Fri, 25 Mar 2022 02:53:59 +0000 (15:53 +1300)
CiviMail - Remove deprecated variable only used by Mosaico

1  2 
CRM/Mailing/Info.php

index bca7024211a68cdfea7d1087ef50754eca782101,accfc60089630b906a9fe8b0fbeb490505f58c6f..4894c74c9957a5cdf223a83073d3023341a0ef5f
@@@ -94,10 -90,8 +89,8 @@@ class CRM_Mailing_Info extends CRM_Core
      $crmMailingSettings = [
        'templateTypes' => CRM_Mailing_BAO_Mailing::getTemplateTypes(),
        'civiMails' => [],
 -      'campaignEnabled' => in_array('CiviCampaign', $config->enableComponents),
 +      'campaignEnabled' => CRM_Core_Component::isEnabled('CiviCampaign'),
        'groupNames' => [],
-       // @todo this is not used in core. Remove once Mosaico no longer depends on it.
-       'testGroupNames' => $groupNames['values'],
        'headerfooterList' => $headerfooterList['values'],
        'mesTemplate' => $mesTemplate['values'],
        'emailAdd' => $emailAdd['values'],