From 0499685e2920c9db0f32455d0d409000ebd3b740 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 6 Apr 2015 23:54:19 -0700
Subject: [PATCH 1/1] 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.
---
 CRM/Mailing/Info.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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(
-- 
2.25.1