lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix website when ckeditor is off

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-09 17:28:08 +01:00
parent cef38016bb
commit c6c321b004
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/main.inc.php
View File

@ -1432,7 +1432,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!$disablejs && !empty($conf->use_javascript_ajax)) if (!$disablejs && !empty($conf->use_javascript_ajax))
{ {
// CKEditor // CKEditor
if (!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))
{ {
print '<!-- Includes JS for CKEditor -->'."\n"; print '<!-- Includes JS for CKEditor -->'."\n";
$pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/'; $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';

1
htdocs/website/index.php
View File

@ -24,6 +24,7 @@
define('NOSCANPOSTFORINJECTION', 1); define('NOSCANPOSTFORINJECTION', 1);
define('NOSTYLECHECK', 1); define('NOSTYLECHECK', 1);
define('USEDOLIBARREDITOR', 1); define('USEDOLIBARREDITOR', 1);
define('FORCE_CKEDITOR', 1); // We need CKEditor, even if module is off.
//header('X-XSS-Protection:0'); // Disable XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated. //header('X-XSS-Protection:0'); // Disable XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.