From: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Thu, 4 Feb 2016 10:36:03 +0000 (+0530)
Subject: CRM-17908: more fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=76bae7699b0a437541a73053b774c6f7689deddf;p=civicrm-core.git

CRM-17908: more fixes

----------------------------------------
* CRM-17908: text version of header/footer not used when auto-generating text version of email
  https://issues.civicrm.org/jira/browse/CRM-17908
---

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 0a9ce2ef1f..58d4f00de2 100644
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -763,7 +763,7 @@ ORDER BY   i.contact_id, i.{$tempColumn}
         if (!empty($this->header->body_text)) {
           $template[] = $this->header->body_text;
         }
-        else {
+        elseif (!empty($this->header->body_html)) {
           $template[] = CRM_Utils_String::htmlToText($this->header->body_html);
         }
 
@@ -777,7 +777,7 @@ ORDER BY   i.contact_id, i.{$tempColumn}
         if (!empty($this->footer->body_text)) {
           $template[] = $this->footer->body_text;
         }
-        else {
+        elseif (!empty($this->footer->body_html)) {
           $template[] = CRM_Utils_String::htmlToText($this->footer->body_html);
         }