Merge pull request #9029 from hregis/6.0_multicompany

Fix: broken feature with edit in place
Dolibarr · Jun 29, 2018 · a6c6bbe · a6c6bbe
2 parents 3f2b3c0 + 2d13b5b
commit a6c6bbe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
@@ -282,7 +282,7 @@ private function editInPlace($object, $value, $htmlname, $condition, $inputType=
         $out='';
 
         // Check parameters
-        if ($inputType == 'textarea') $value = dol_nl2br($value);
+        if (preg_match('/^text/',$inputType)) $value = dol_nl2br($value);
         else if (preg_match('/^numeric/',$inputType)) $value = price($value);
         else if ($inputType == 'day' || $inputType == 'datepicker') $value = dol_print_date($value, 'day');
 

diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
@@ -71,7 +71,7 @@
 elseif ($module == 'product')    		 { $permission=$user->rights->produit->creer;}
 //else dol_print_error('','Bad value '.$module.' for param module');
 
-if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:95%';	// Rem: This var is for all notes, not only thirdparties note.
+if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:95%';	// Rem: This var is for all notes, not only thirdparties note.
 else $typeofdata='textarea:12:95%';
 
 ?>