From 214dbc1ce5e496158394656664346ee928f4d429 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 16 Jul 2015 05:33:51 +0200 Subject: [PATCH] Fix: Opensurvey show description in view mode without fckeditor --- htdocs/opensurvey/card.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index bd0d2cb8a51..35837c0331d 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -220,7 +220,7 @@ else print dol_htmlentities($object->titre); print ''; // Description -print ''.$langs->trans("Description") .''; +print ''.$langs->trans("Description") .''; if ($action == 'edit') { $doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120); @@ -228,12 +228,7 @@ if ($action == 'edit') } else { - if (empty($conf->fckeditor->enabled)) print dol_htmlentitiesbr($object->commentaires); - else - { - $doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120,1); - $doleditor->Create(0,''); - } + print (dol_textishtml($object->commentaires)?$object->commentaires:dol_nl2br($object->commentaires,1,true)); } print '';