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

---
 htdocs/lib/doleditor.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php
index 2ec1d372a57..282d7ec596a 100644
--- a/htdocs/lib/doleditor.class.php
+++ b/htdocs/lib/doleditor.class.php
@@ -70,7 +70,8 @@ class DolEditor
     	dol_syslog("DolEditor::DolEditor htmlname=".$htmlname." tool=".$tool);
 
         // Name of extended editor to use
-    	$this->tool=empty($conf->global->MAIN_EXTENDED_EDITOR_NAME)?'fckeditor':$conf->global->MAIN_EXTENDED_EDITOR_NAME;
+    	//$this->tool=empty($conf->global->MAIN_EXTENDED_EDITOR_NAME)?'fckeditor':$conf->global->MAIN_EXTENDED_EDITOR_NAME;    // Name of constants must be NAMEOFMODULE_XXX
+        $this->tool=empty($conf->global->FCKEDITOR_EDITORNAME)?'fckeditor':$conf->global->FCKEDITOR_EDITORNAME;
 
         // Check if extended editor is ok. If not we force textarea
         if (empty($conf->fckeditor->enabled) || ! $okforextendededitor)
@@ -148,18 +149,18 @@ class DolEditor
             if ($this->tool == 'ckeditor')
             {
             	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
-            	
+
             	print '<script type="text/javascript">
             			jQuery(document).ready(function () {
             				CKEDITOR.replace(\''.$this->htmlname.'\',
-            					{ 
+            					{
             						customConfig : \''.DOL_URL_ROOT.'/theme/'.$conf->theme.'/ckeditor/config.js\',
             						toolbar: \''.$this->toolbarname.'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
             						//width: '.$this->width.',
             						height: '.$this->height.'
             					});
-            				
+
             			});
             			</script>';
             }