From 9d364554d9e51f63ca7488d821d97adb022a002d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 1 Feb 2011 18:37:16 +0000
Subject: [PATCH] Keep most possible javascript into head

---
 htdocs/main.inc.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d3e3cc51b5f..fcb0b099a1f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -886,6 +886,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 			{
 				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest'.$ext.'"></script>'."\n";
 			}
+            // CKEditor
+            if (! empty($conf->global->FCKEDITOR_EDITORNAME) && $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor')
+            {
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/ckeditor/ckeditor.js"></script>'."\n";
+            }
 		}
 
 		// Output module javascript
@@ -1566,12 +1571,6 @@ if (! function_exists("llxFooter"))
 
 		print "\n";
 		if ($foot) print '<!-- '.$foot.' -->'."\n";
-		
-		// CKEditor
-		if (defined('REQUIRE_CKEDITOR'))
-		{
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/ckeditor/ckeditor.js"></script>'."\n";
-		}
 
 		if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";