lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Opensurvey show description in view mode without fckeditor

Browse Source
This commit is contained in:
aspangaro 2015-07-16 05:33:51 +02:00
parent 8689b22e14
commit 214dbc1ce5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/opensurvey/card.php
View File

@ -220,7 +220,7 @@ else print dol_htmlentities($object->titre);
print '</td></tr>'; print '</td></tr>';
// Description // Description
print '<tr><td valign="top">'.$langs->trans("Description") .'</td><td colspan="2">'; print '<tr><td class="tdtop">'.$langs->trans("Description") .'</td><td colspan="2">';
if ($action == 'edit') if ($action == 'edit')
{ {
$doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120); $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 else
{ {
if (empty($conf->fckeditor->enabled)) print dol_htmlentitiesbr($object->commentaires); print (dol_textishtml($object->commentaires)?$object->commentaires:dol_nl2br($object->commentaires,1,true));
else
{
$doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120,1);
$doleditor->Create(0,'');
}
} }
print '</td></tr>'; print '</td></tr>';