Merge remote-tracking branch 'osticket/develop-next' into develop-next

include/ajax.tickets.php

@@ -1285,7 +1285,7 @@ function refer($tid, $target=null) {
                 case 'unanswered':
                     if(!$ticket->isAnswered())
                         $errors['err'] = __('Ticket is already marked as unanswered');
-                    elseif (!$ticket->markUnanswered())
+                    elseif (!$ticket->markUnAnswered())
                         $errors['err'] - __('Cannot mark ticket as unanswered');
                     break;
 

include/staff/templates/user-import.tmpl.php

@@ -34,7 +34,7 @@ if ($org_id) { ?>
 'To import more other fields, use the Upload tab.'); ?></em>
 </p>
 <textarea name="pasted" style="display:block;width:100%;height:8em"
-    placeholder="<?php echo __('e.g. John Doe, john.doe@osticket.com'); ?>">
+    placeholder="<?php echo __('Name, Email'. PHP_EOL. ' John Doe, john.doe@osticket.com'); ?>">
 <?php echo $info['pasted']; ?>
 </textarea>
 </div>

include/staff/ticket-view.inc.php

@@ -162,8 +162,8 @@ if($ticket->isOverdue())
                             echo __('Mark as Overdue'); ?></a></li>
                     <?php
                     }
-                 } elseif($ticket->isOpen() && $canAnswer) {
-
+                 }
+                 if($ticket->isOpen() && $canAnswer) {
                     if($ticket->isAnswered()) { ?>
                     <li><a href="#tickets/<?php echo $ticket->getId();
                         ?>/mark/unanswered" class="ticket-action"