diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 532c2746..a8c2e828 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1983,7 +1983,7 @@ function hesk_printCanned()
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else {
- document.getElementById('message').value = myMsg;
+ $('#message').html(myMsg);
}
}
else {
@@ -1992,8 +1992,8 @@ function hesk_printCanned()
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
} else {
- var oldMsg = document.getElementById('message').value;
- document.getElementById('message').value = oldMsg + myMsg;
+ var oldMsg = $('#message').html();
+ $('#message').html(oldMsg + myMsg);
}
}
}
diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index c27d32ba..17bf0fb5 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -248,9 +248,9 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
}
else {
- document.getElementById('message').value = '';
+ $('#message').html('');
}
- document.getElementById('subject').value = '';
+ $('#subject').val('');
return true;
}
if (document.getElementById) {
@@ -258,8 +258,10 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else {
- document.getElementById('message').value = myMsg;
+ $('#message').html(myMsg);
}
+ mySubject = $('').html(mySubject).text();
+ $('#subject').val(mySubject);
document.getElementById('subject').value = mySubject;
}
else {
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index 775d176b..3d3cb844 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -326,9 +326,9 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
}
else {
- document.getElementById('message').value = '';
+ $('#message').html('');
}
- document.getElementById('subject').value = '';
+ $('#subject').val('');
return true;
}
if (document.getElementById) {
@@ -336,9 +336,10 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else {
- document.getElementById('message').value = myMsg;
+ $('#message').html(myMsg);
}
- document.getElementById('subject').value = mySubject;
+ mySubject = $('').html(mySubject).text();
+ $('#subject').val(mySubject);
}
else {
document.form1.message.value = myMsg;
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 4d349edd..65a364cb 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 {
- document.getElementById('message').value = '';
+ $('#message').html('');
}
- document.getElementById('subject').value = '';
+ $('#subject').html('');
}
return true;
}
@@ -647,9 +647,10 @@ if (hesk_dbNumRows($res)) {
tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else {
- document.getElementById('message').value = myMsg;
+ $('#message').html(myMsg);
}
- document.getElementById('subject').value = mySubject;
+ mySubject = $('').html(mySubject).text();
+ $('#subject').val(mySubject);
}
else {
if (useHtmlEditor) {
@@ -658,10 +659,11 @@ if (hesk_dbNumRows($res)) {
tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
} else {
var oldMsg = document.getElementById('message').value;
- document.getElementById('message').value = oldMsg + myMsg;
+ $('#message').html(oldMsg + myMsg);
}
if (document.getElementById('subject').value == '') {
- document.getElementById('subject').value = mySubject;
+ mySubject = $('').html(mySubject).text();
+ $('#subject').val(mySubject);
}
}
}