Merge pull request #890 from greezybacon/issue/text-emails-to-html

thread: Always embed HTML in email templates

Reviewed-By: Peter Rotich <peter@osticket.com>

include/class.thread.php

@@ -776,7 +776,7 @@ Class ThreadEntry {
     }
 
     function asVar() {
-        return (string) $this;
+        return (string) $this->getBody()->display('html');
     }
 
     function getVar($tag) {
@@ -1381,6 +1381,11 @@ class TextThreadBody extends ThreadBody {
             return '<pre>'.$this->body.'</pre>';
         }
     }
+
+    function asVar() {
+        // Email template, assume HTML
+        return $this->display('html');
+    }
 }
 class HtmlThreadBody extends ThreadBody {
     function __construct($body, $options=array()) {