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

FIX Force of HTML content only for ckeditor

Browse Source 
Conflicts:
	htdocs/modulebuilder/index.php
This commit is contained in:
Laurent Destailleur 2020-05-29 03:26:05 +02:00
parent 5a9d968a75
commit b11ef125c3
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/doleditor.class.php
View File

@ -88,7 +88,7 @@ class DolEditor
// Define some properties // Define some properties
if (in_array($this->tool, array('textarea', 'ckeditor', 'ace'))) if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))
{ {
if (! dol_textishtml($content) && $this->tool != 'textarea') { // We force content into HTML if we are using an advanced editor if content is not HTML. if ($this->tool == 'ckeditor' && ! dol_textishtml($content)) { // We force content to be into HTML if we are using an advanced editor if content is not HTML.
$this->content = dol_nl2br($content); $this->content = dol_nl2br($content);
} }
else { else {

4
htdocs/modulebuilder/index.php
View File

@ -2005,9 +2005,7 @@ elseif (!empty($module))
} }
dol_fiche_end(); dol_fiche_end();
} } else { // Edit text file
else
{
$fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2 $fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2
if ($fullpathoffile) if ($fullpathoffile)