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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2018-11-16 14:13:18 +01:00
commit 3b193a8a7b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -708,6 +708,16 @@ class EmailCollector extends CommonObject
* *
* @return int 0=OK, Nb of error if error * @return int 0=OK, Nb of error if error
*/ */
/**
* overwitePropertiesOfObject
*
* @param object $object Current object
* @param string $actionparam Action parameters
* @param string $messagetext Body
* @param string $subject Subject
* @return int 0=OK, Nb of error if error
*/
private function overwritePropertiesOfObject(&$object, $actionparam, $messagetext, $subject) private function overwritePropertiesOfObject(&$object, $actionparam, $messagetext, $subject)
{ {
$errorforthisaction = 0; $errorforthisaction = 0;
@ -1060,7 +1070,6 @@ class EmailCollector extends CommonObject
} }
} }
} }
} }
if (empty($thirdpartyid)) // Try to find thirdparty using email if (empty($thirdpartyid)) // Try to find thirdparty using email
@ -1246,7 +1255,6 @@ class EmailCollector extends CommonObject
else else
{ {
dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG); dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG);
} }
} }
else else