From 1b58a07c909154f3cf24222d01a6fe5ad0997ccc Mon Sep 17 00:00:00 2001 From: ericLemanissier <e.lemanissier@physioflow.com> Date: Thu, 4 Jun 2015 07:44:13 +0200 Subject: [PATCH] Split translated string removed string of random token and newline chars from translated log string --- include/class.mailer.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/class.mailer.php b/include/class.mailer.php index 76f48ba00..07208a871 100644 --- a/include/class.mailer.php +++ b/include/class.mailer.php @@ -514,7 +514,8 @@ class Mailer { // Force reconnect on next ->send() unset($smtp_connections[$key]); - $alert=sprintf(_S("Unable to email via SMTP:%1\$s:%2\$d [%3\$s]\n\n%4\$s\n"), + $alert=_S("Unable to email via SMTP") + .sprintf(":%1\$s:%2\$d [%3\$s]\n\n%4\$s\n", $smtp['host'], $smtp['port'], $smtp['username'], $result->getMessage()); $this->logError($alert); } @@ -527,7 +528,8 @@ class Mailer { if(!PEAR::isError($result)) return $messageId; - $alert=sprintf(_S("Unable to email via php mail function:%1\$s\n\n%2\$s\n"), + $alert=_S("Unable to email via php mail function") + .sprintf(":%1\$s\n\n%2\$s\n", $to, $result->getMessage()); $this->logError($alert); return false; -- GitLab