From: Tim Otten <totten@civicrm.org>
Date: Tue, 7 Apr 2015 06:54:19 +0000 (-0700)
Subject: CRM-16237 - crmMailing - Restore checking of required tokens
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0499685e2920c9db0f32455d0d409000ebd3b740;hp=12b928bcdf8adf1226343016dabe66e9f4862c3e;p=civicrm-core.git

CRM-16237 - crmMailing - Restore checking of required tokens

The header/footer day was optimized in beta by removing the
body_html/body_text -- but this optimization made it impossible to check for
required tokens.
---

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index 9fdcf6c615..56a9cfe6b4 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -120,7 +120,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     ));
     $headerfooterList = civicrm_api3('MailingComponent', 'get', $params + array(
       'is_active' => 1,
-      'return' => array('name', 'component_type', 'is_default'),
+      'return' => array('name', 'component_type', 'is_default', 'body_html', 'body_text'),
     ));
 
     $emailAdd = civicrm_api3('Email', 'get', array(