diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index f5b9062cee7..d02f26e57a4 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -172,6 +172,7 @@ class DolEditor //$skin='office2003'; //$skin='v2'; $skin='kama'; + if (constant('JS_CKEDITOR')) $skin='moono'; // To use external ckeditor 4 js lib $htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false'; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 255b4fd4afd..54fb4f781b7 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1202,14 +1202,19 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs { print ''."\n"; $pathckeditor=DOL_URL_ROOT.'/includes/ckeditor/'; - if (constant('JS_CKEDITOR')) $pathckeditor=JS_CKEDITOR; // To use external ckeditor js lib + $jsckeditor='ckeditor_basic.js'; + if (constant('JS_CKEDITOR')) // To use external ckeditor 4 js lib + { + $pathckeditor=constant('JS_CKEDITOR'); + $jsckeditor='ckeditor.js'; + } print ''."\n"; - print ''."\n"; + print ''."\n"; } // Global js function