diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index b35c4a0da47..ddb13b64142 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -51,7 +51,6 @@ if ($_POST["action"] == 'update' || $_POST["action"] == 'add') if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $value=$_POST["constvalue".$const]; $type=$_POST["consttype"]; $constnote=isset($_POST["constnote"])?$_POST["constnote"]:''; - $result=dolibarr_set_const($db,$const,$value,$typeconst[$type],0,$constnote,$conf->entity); if ($result < 0) { @@ -371,19 +370,9 @@ function form_constantes($tableau) } else if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) { - // Editor wysiwyg - if ($conf->fckeditor->enabled) - { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('constvalue'.$const,$obj->value,160,'dolibarr_notes','',false,false); - $doleditor->Create(); - } - else - { - print ''; - } + require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + $doleditor=new DolEditor('constvalue'.$const,$obj->value,160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60); + $doleditor->Create(); print ''; print ''; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index d626ae9b4e4..1d8a389b7f0 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1514,7 +1514,8 @@ class CommonObject } if ($_GET["action"] == 'editline') { - // editeur wysiwyg + require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + // editeur wysiwyg if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); @@ -1570,7 +1571,7 @@ class CommonObject print "\n"; } } - + /** * \brief Load type of canvas * \param id element id