Merge pull request #210 from greezybacon/issue/canned-reply-break

thread: Honor html setting when concatenating canned response

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

include/class.ticket.php

@@ -2213,8 +2213,10 @@ class Ticket {
         if($tpl && ($msg=$tpl->getNewTicketNoticeMsgTemplate()) && $email) {
 
             $message = $vars['message'];
-            if($response)
-                $message.="\n\n".$response->getBody();
+            if($response) {
+                $message .= ($cfg->isHtmlThreadEnabled()) ? "<br><br>" : "\n\n";
+                $message .= $response->getBody();
+            }
 
             if($vars['signature']=='mine')
                 $signature=$thisstaff->getSignature();