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

Merge pull request #10705 from atm-gauthier/8.0_fix_best_error_msg

Browse Source 
FIX : if empty error message, we just see "error" displayed
This commit is contained in:
Laurent Destailleur 2019-02-28 11:25:13 +01:00 committed by GitHub
commit 74dec41496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/mailings/modules_mailings.php
View File

@ -188,8 +188,8 @@ class MailingTargets // This can't be abstract as it is used for some method
if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
// Si erreur autre que doublon // Si erreur autre que doublon
dol_syslog($this->db->error()); dol_syslog($this->db->error().' : '.$targetarray['email']);
$this->error=$this->db->error(); $this->error=$this->db->error().' : '.$targetarray['email'];
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }

4
htdocs/core/modules/mailings/xinputfile.modules.php
View File

@ -179,7 +179,9 @@ class mailing_xinputfile extends MailingTargets
{ {
$i++; $i++;
$langs->load("errors"); $langs->load("errors");
$this->error = $langs->trans("ErrorFoundBadEmailInFile",$i,$cpt,$email); $msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
if (!empty($msg)) $this->error = $msg;
else $this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email; // We experience case where $langs->trans return an empty string.
} }
} }
} }