Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

syntax

Browse Source
This commit is contained in:
Florian HENRY
2015-02-11 11:48:11 +01:00
parent db94860f76
commit db2dee7c03
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ class DolEditor
//$skin='kama'; //$skin='kama';
$skin='moono'; // default with cdeditor 4 $skin='moono'; // default with cdeditor 4
$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false'; $htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
$out.= '<script type="text/javascript"> $out.= '<script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {

2
htdocs/core/class/html.formmail.class.php
View File

@@ -616,7 +616,7 @@ class FormMail
$this->substit['__SIGNATURE__'] = dol_nl2br($this->substit['__SIGNATURE__']); $this->substit['__SIGNATURE__'] = dol_nl2br($this->substit['__SIGNATURE__']);
} else if(!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) { } else if(!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) {
$defaultmessage = dol_nl2br($defaultmessage); $defaultmessage = dol_nl2br($defaultmessage);
} }
if (dol_textishtml($defaultmessage) && $from_template) { if (dol_textishtml($defaultmessage) && $from_template) {
$allow_content=1; $allow_content=1;