Update html.formmail.class.php

Conflicts:
	htdocs/core/class/html.formmail.class.php
This commit is contained in:
Frédéric FRANCE 2019-03-14 08:19:22 +01:00 committed by Laurent Destailleur
parent 8410d59182
commit b67429218d

View File

@ -78,7 +78,7 @@ class FormMail extends Form
/** /**
* @var int * @var int
* @deprecated Fill withto with array before calling method. * @deprecated Fill withto with array before calling method.
* @see withto * @see $withto
*/ */
public $withtosocid; public $withtosocid;
@ -1290,7 +1290,7 @@ class FormMail extends Form
* @param CommonObject $object Object to use * @param CommonObject $object Object to use
* @param Translate $outputlangs Object lang * @param Translate $outputlangs Object lang
* @return void * @return void
* @see getCommonSubstitutionArray * @see getCommonSubstitutionArray()
*/ */
function setSubstitFromObject($object, $outputlangs) function setSubstitFromObject($object, $outputlangs)
{ {