projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #23615 from totten/master-mysql-bump
[civicrm-core.git]
/
CRM
/
Mailing
/
Info.php
diff --git
a/CRM/Mailing/Info.php
b/CRM/Mailing/Info.php
index accfc60089630b906a9fe8b0fbeb490505f58c6f..4894c74c9957a5cdf223a83073d3023341a0ef5f 100644
(file)
--- a/
CRM/Mailing/Info.php
+++ b/
CRM/Mailing/Info.php
@@
-41,7
+41,6
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
}
}
}
}
- $config = CRM_Core_Config::singleton();
$session = CRM_Core_Session::singleton();
$contactID = $session->get('userID');
$session = CRM_Core_Session::singleton();
$contactID = $session->get('userID');
@@
-90,7
+89,7
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
$crmMailingSettings = [
'templateTypes' => CRM_Mailing_BAO_Mailing::getTemplateTypes(),
'civiMails' => [],
$crmMailingSettings = [
'templateTypes' => CRM_Mailing_BAO_Mailing::getTemplateTypes(),
'civiMails' => [],
- 'campaignEnabled' =>
in_array('CiviCampaign', $config->enableComponents
),
+ 'campaignEnabled' =>
CRM_Core_Component::isEnabled('CiviCampaign'
),
'groupNames' => [],
'headerfooterList' => $headerfooterList['values'],
'mesTemplate' => $mesTemplate['values'],
'groupNames' => [],
'headerfooterList' => $headerfooterList['values'],
'mesTemplate' => $mesTemplate['values'],