Merge pull request #1198 from greezybacon/issue/canned-message-quote-swap

oops: Swapped last-message and original message

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

include/ajax.tickets.php

@@ -671,9 +671,12 @@ class TicketsAjaxAPI extends AjaxController {
 
             // Ticket thread variables are assumed to be quotes
             $response = "<br/><blockquote>$response</blockquote><br/>";
+
             //  Return text if html thread is not enabled
             if (!$cfg->isHtmlThreadEnabled())
                 $response = Format::html2text($response, 90);
+            else
+                $response = Format::viewableImages($response);
 
             // XXX: assuming json format for now.
             return Format::json_encode(array('response' => $response));

include/staff/ticket-view.inc.php

@@ -509,8 +509,8 @@ $tcount+= $ticket->getNumNotes();
                 <td>
                     <select id="cannedResp" name="cannedResp">
                         <option value="0" selected="selected">Select a canned response</option>
-                        <option value='lastmessage'>Original Message</option>
-                        <option value='original'>Last Message</option>
+                        <option value='original'>Original Message</option>
+                        <option value='lastmessage'>Last Message</option>
                         <?php
                         if(($cannedResponses=Canned::responsesByDeptId($ticket->getDeptId()))) {
                             echo '<option value="0" disabled="disabled">