diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 9256e08318c..d79999ccdcb 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -169,7 +169,8 @@ class DolEditor //$skin='office2003'; //$skin='v2'; $skin='kama'; - + if (constant('JS_CKEDITOR')) $skin='moono'; // To use external ckeditor 4 js lib + if ($this->toolbarname=='dolibarr_mailings') {$htmlencode_force='true';} else {$htmlencode_force='false';} diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index f51cf7b6bd3..6427cf25fd5 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1051,14 +1051,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"; } // jQuery Timepicker if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))