From 3515beedb2a1e6a20665be6e0ecbd1b3b1d12a68 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 17 Mar 2007 23:27:09 +0000 Subject: [PATCH] =?UTF-8?q?diff=E9rents=20tests=20pour=20r=E9gler=20le=20p?= =?UTF-8?q?robl=E8me=20de=20la=20cr=E9ation=20d'une=20cat=E9gorie=20avec?= =?UTF-8?q?=20IE7=20(non=20r=E9solu)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/categories/fiche.php | 2 +- htdocs/lib/doleditor.class.php | 42 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index db7aab29de4..c5f424d54dc 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -139,7 +139,7 @@ if ($user->rights->categorie->creer) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); $doleditor=new DolEditor('description',$categorie->description,200,'dolibarr_notes'); $doleditor->Create(); } diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php index d4536fa4fa1..b4675de7a6b 100644 --- a/htdocs/lib/doleditor.class.php +++ b/htdocs/lib/doleditor.class.php @@ -52,37 +52,37 @@ class DolEditor */ function DolEditor($htmlname,$content,$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false) { - global $conf,$langs; - - dolibarr_syslog("DolEditor::DolEditor"); + global $conf,$langs; + + dolibarr_syslog("DolEditor::DolEditor"); require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php"); $this->editor = new FCKeditor($htmlname); - $this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ; + $this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ; $this->editor->Value = $content; - $this->editor->Height = $height; - $this->editor->ToolbarSet = $toolbarname; - $this->editor->Config['AutoDetectLanguage'] = 'true'; - $this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In'; - $this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded; - - $this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart=fckeditor&file='; - $this->editor->Config['UserFilesAbsolutePath'] = DOL_DOCUMENT_ROOT.'/fckeditor/' ; - - if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js')) - { - $this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'; - $this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/'; + $this->editor->Height = $height; + $this->editor->ToolbarSet = $toolbarname; + $this->editor->Config['AutoDetectLanguage'] = 'true'; + $this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In'; + $this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded; + + $this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart=fckeditor&file='; + $this->editor->Config['UserFilesAbsolutePath'] = DOL_DOCUMENT_ROOT.'/fckeditor/' ; + + if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js')) + { + $this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'; + $this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/'; // if ($langs->origlang!='auto') // { // } - } - else - { + } + else + { // if ($langs->origlang!='auto') // { // } - } + } }