diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index a8c2e828..270fcbc0 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1983,7 +1983,8 @@ function hesk_printCanned()
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else {
- $('#message').html(myMsg);
+ myMsg = $('').html(myMsg).text();
+ $('#message').val(myMsg).trigger('input');
}
}
else {
@@ -1992,8 +1993,9 @@ function hesk_printCanned()
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
} else {
- var oldMsg = $('#message').html();
- $('#message').html(oldMsg + myMsg);
+ var oldMsg = $('#message').text();
+ var newMsg = $('').html(oldMsg + myMsg).text();
+ $('#message').val(newMsg).trigger('input');
}
}
}
diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index 17bf0fb5..16f10252 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -248,7 +248,7 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
}
else {
- $('#message').html('');
+ $('#message').val('');
}
$('#subject').val('');
return true;
@@ -258,11 +258,11 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else {
- $('#message').html(myMsg);
+ myMsg = $('').html(myMsg).text();
+ $('#message').val(myMsg).trigger('input');
}
mySubject = $('').html(mySubject).text();
- $('#subject').val(mySubject);
- document.getElementById('subject').value = mySubject;
+ $('#subject').val(mySubject).trigger('input');
}
else {
document.form1.message.value = myMsg;
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index 3d3cb844..fe0b6603 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -326,7 +326,7 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
}
else {
- $('#message').html('');
+ $('#message').val('');
}
$('#subject').val('');
return true;
@@ -336,10 +336,11 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else {
- $('#message').html(myMsg);
+ myMsg = $('').html(myMsg).text();
+ $('#message').val(myMsg).trigger('input');
}
mySubject = $('').html(mySubject).text();
- $('#subject').val(mySubject);
+ $('#subject').val(mySubject).trigger('input');
}
else {
document.form1.message.value = myMsg;
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 65a364cb..519e257d 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -635,9 +635,9 @@ if (hesk_dbNumRows($res)) {
tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
}
else {
- $('#message').html('');
+ $('#message').val('');
}
- $('#subject').html('');
+ $('#subject').val('');
}
return true;
}
@@ -647,10 +647,11 @@ if (hesk_dbNumRows($res)) {
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else {
- $('#message').html(myMsg);
+ myMsg = $('').html(myMsg).text();
+ $('#message').val(myMsg).trigger('input');
}
mySubject = $('').html(mySubject).text();
- $('#subject').val(mySubject);
+ $('#subject').val(mySubject).trigger('input');
}
else {
if (useHtmlEditor) {
@@ -659,11 +660,12 @@ if (hesk_dbNumRows($res)) {
tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
} else {
var oldMsg = document.getElementById('message').value;
- $('#message').html(oldMsg + myMsg);
+ var theMsg = $('').html(oldMsg + myMsg).text();
+ $('#message').val(theMsg).trigger('input');
}
if (document.getElementById('subject').value == '') {
mySubject = $('').html(mySubject).text();
- $('#subject').val(mySubject);
+ $('#subject').val(mySubject).trigger('input');
}
}
}
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 16578588..a3d076c2 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -43,6 +43,7 @@ $modsForHesk_settings = array();
if (is_dir(HESK_PATH . 'install')) {
$modsForHesk_settings['rtl'] = 0;
$modsForHesk_settings['use_bootstrap_theme'] = 1;
+ $modsForHesk_settings['show_icons'] = 1;
$modsForHesk_settings['navbarBackgroundColor'] = '#414a5c';
$modsForHesk_settings['navbarBrandColor'] = '#d4dee7';
$modsForHesk_settings['navbarBrandHoverColor'] = '#ffffff';