Hesk v3.2.0

This commit is contained in:
Luke Tainton
2021-03-06 16:23:18 +00:00
parent a5296eea55
commit ac0640212a
222 changed files with 16911 additions and 1089 deletions

View File

@@ -49,10 +49,11 @@ $onload='';
}
/* If page requires WYSIWYG editor include TinyMCE Javascript */
if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg'])
if (defined('WYSIWYG') && ($hesk_settings['staff_ticket_formatting'] == 2 || $hesk_settings['kb_wysiwyg']))
{
require(HESK_PATH . 'inc/tiny_mce/tinymce.inc.php');
?>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>inc/tiny_mce/5.4.2/tinymce.min.js"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>inc/tiny_mce/5.6.2/tinymce.min.js"></script>
<?php
}
@@ -214,6 +215,10 @@ $onload='';
});
</script>
<?php if ($hesk_settings['admin_css']): ?>
<link rel="stylesheet" href="<?php echo $hesk_settings['admin_css_url']; ?>">
<?php endif; ?>
</head>
<body onload="<?php echo $onload; unset($onload); ?>">