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

FIX Missing a new line into log of sent emails

Browse Source
This commit is contained in:
Laurent Destailleur 2016-04-07 12:42:18 +02:00
parent 2c829e7cb6
commit 059466030a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@ -4525,7 +4525,7 @@ function dol_textishtml($msg,$option=0)
}
/**
* Concat 2 descriptions (second one after first one with a new line separator if required)
* Concat 2 descriptions with a new line between them (second operand after first one with appropriate new line separator)
* text1 html + text2 html => text1 + '<br>' + text2
* text1 html + text2 txt => text1 + '<br>' + dol_nl2br(text2)
* text1 txt + text2 html => dol_nl2br(text1) + '<br>' + text2

2
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
View File

@ -683,7 +683,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$attachs=$_SESSION['listofnames'];
if ($attachs && strpos($action,'SENTBYMAIL'))
{
$object->actionmsg.="\n".$langs->transnoentities("AttachedFiles").': '.$attachs;
$object->actionmsg=dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
}
}