Revert "CRM-17908: text version of header/footer not used when auto-generatin…"

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 607ef31f12793053e47a82148a01bcb2a5d2e559..330bb9c8d95f8a3d3e0d2ed609bb93338dac31d9 100644 (file)
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -758,28 +758,18 @@ ORDER BY   i.contact_id, i.{$tempColumn}
     if (!$this->templates) {
       $this->getHeaderFooter();
       $this->templates = array();
-      if ($this->body_text || $this->header->body_text || $this->footer->body_text) {
+
+      if ($this->body_text) {
         $template = array();
-        if ($this->header->body_text) {
+        if ($this->header) {
           $template[] = $this->header->body_text;
         }
-        else {
-          $template[] = CRM_Utils_String::htmlToText($this->header->body_html);
-        }
 
-        if ($this->body_text) {
-          $template[] = $this->body_text;
-        }
-        else {
-          $template[] = CRM_Utils_String::htmlToText($this->body_html);
-        }
+        $template[] = $this->body_text;
 
-        if ($this->footer->body_text) {
+        if ($this->footer) {
           $template[] = $this->footer->body_text;
         }
-        else {
-          $template[] = CRM_Utils_String::htmlToText($this->footer->body_html);
-        }
 
         $this->templates['text'] = implode("\n", $template);
       }
@@ -802,7 +792,7 @@ ORDER BY   i.contact_id, i.{$tempColumn}
         // this is where we create a text template from the html template if the text template did not exist
         // this way we ensure that every recipient will receive an email even if the pref is set to text and the
         // user uploads an html email only
-        if (empty($this->templates['text'])) {
+        if (!$this->body_text) {
           $this->templates['text'] = CRM_Utils_String::htmlToText($this->templates['html']);
         }
       }