diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0a7c20c7d2a..11430c35640 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -941,21 +941,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; } } - // CKEditor - if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor')) - { - print ''."\n"; - if (constant('JS_CKEDITOR')) - { - print ''."\n"; - print ''."\n"; - } - else - { - print ''."\n"; - print ''."\n"; - } - } // jQuery jeditable if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) { @@ -975,7 +960,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; } - // File Upload + // jQuery File Upload if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD)) { print ''."\n"; @@ -983,7 +968,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; } - // DataTables + // jQuery DataTables if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES)) { print ''."\n"; @@ -991,6 +976,21 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; } + // CKEditor + if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor')) + { + print ''."\n"; + if (constant('JS_CKEDITOR')) + { + print ''."\n"; + print ''."\n"; + } + else + { + print ''."\n"; + print ''."\n"; + } + } // Global js function print ''."\n";