Merge branch '3-2-3' into 'master'

3.2.3 See merge request mike-koch/Mods-for-HESK!80
mike-koch · Nov 20, 2017 · 15b9714 · 15b9714
2 parents f8ab899 + fefe1e2
commit 15b9714
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
@@ -1561,7 +1561,7 @@ function hesk_getAdminButtons($category_id)
 
 function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
 {
-    global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager;
+    global $hesk_settings, $hesklang, $ticket, $trackingID, $can_edit, $can_archive, $can_delete, $isManager;
 
     $options = $reply ? '' : '<div class="pull-right">';
 
@@ -1934,7 +1934,7 @@ function mfh_print_reply($reply) {
                         ?>
                     </div>
                     <div class="col-md-6 text-right">
-                        <?php echo hesk_getAdminButtonsInTicket(); ?>
+                        <?php echo hesk_getAdminButtonsInTicket($reply); ?>
                     </div>
                 </div>
             </div>

diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php
@@ -512,10 +512,10 @@ function hesk_mail($to, $subject, $message, $htmlMessage, $modsForHesk_settings,
         $headers .= "MIME-Version: 1.0\n";
         $headers .= "From: $hesk_settings[from_header]\n";
         if (count($cc) > 0) {
-            $headers .= "Cc: " . implode(',', $cc);
+            $headers .= "Cc: " . implode(',', $cc) . "\n";
         }
         if (count($bcc) > 0) {
-            $headers .= "Bcc: " . implode(',', $bcc);
+            $headers .= "Bcc: " . implode(',', $bcc) . "\n";
         }
         $headers .= "Reply-To: $hesk_settings[from_header]\n";
         $headers .= "Return-Path: $hesk_settings[webmaster_mail]\n";