Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 09:01:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
This commit is contained in:
Laurent Destailleur
2018-02-27 19:18:43 +01:00
parent b090f0da9c 75cbc466d5
commit 04934cc4aa
127 changed files with 193 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,6 +252,14 @@ class FormMail extends Form
$langs->load("other");
$langs->load("mails");
// Clear temp files. Must be done at beginning, before call of triggers
if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
{
$this->clear_attached_files();
}
// Call hook getFormMail
$hookmanager->initHooks(array('formmail'));
$parameters=array(
@@ -306,7 +314,6 @@ class FormMail extends Form
if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
{
$this->clear_attached_files();
if (! empty($arraydefaultmessage['joinfiles']) && is_array($this->param['fileinit']))
{
foreach($this->param['fileinit'] as $file)
@@ -399,7 +406,7 @@ class FormMail extends Form
$out.= '<table class="border" width="100%">'."\n";
$out.= '<table class="border" width="100%" style="border-top: 1px solid #BBB;">'."\n";
// Substitution array
if (! empty($this->withsubstit)) // Unset or set ->withsubstit=0 to disable this.