Fixes #463 Support suggested KB articles when rich text is enabled

merge-requests/48/head
Mike Koch 7 years ago
parent ba0a035d88
commit 55c6f4d093

@ -168,6 +168,11 @@ function hesk_suggestKB() {
var d = document.form1;
var s = d.subject.value;
var m = d.message.value;
if ($('textarea[name="message"]').data('rich-text-enabled') && tinyMCE.get('message') !== undefined) {
m = tinyMCE.get('message').getContent();
}
var element = document.getElementById('kb_suggestions');
if (s != '' && m != '' && (heskKBquery != s + " " + m || heskKBfailed == true)) {

@ -680,6 +680,7 @@ function print_add_ticket()
<div class="col-sm-9">
<textarea placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>" name="message"
id="message" class="form-control htmlEditor" rows="12"
data-rich-text-enabled="<?php echo $modsForHesk_settings['rich_text_for_tickets_for_customers']; ?>"
cols="60" <?php if (in_array('message', $_SESSION['iserror'])) {
echo ' class="isError" ';
} ?> data-error="<?php echo htmlspecialchars($hesklang['enter_message']); ?>"

@ -23,7 +23,7 @@ hesk_load_database_functions();
header('Content-Type: text/html; charset=' . $hesklang['ENCODING']);
/* Get the search query composed of the subject and message */
$query = hesk_REQUEST('q') or die('');
$query = strip_tags(html_entity_decode(hesk_REQUEST('q'))) or die('');
hesk_dbConnect();

Loading…
Cancel
Save