aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2013-10-17 19:38:06 +0000
committerrvelices <rv-github@modusoptimus.com>2013-10-17 19:38:06 +0000
commit5abcfccff06f64ba3e7d273c0e5a3b6ec56d047c (patch)
tree5e2f44cc3d886db2ba88194d90fb6cdd04be823d /include
parentbb083e63d0d4fe56598ec7bbd88850b103782406 (diff)
removed unused css rules, password recover form has a fieldset as all other forms, no exit if mail send fails
git-svn-id: http://piwigo.org/svn/trunk@24966 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_mail.inc.php13
1 files changed, 5 insertions, 8 deletions
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 265ed13b8..51858cf33 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -539,8 +539,6 @@ function pwg_mail($to, $args = array())
if (!empty($args['Bcc']))
{
- $headers.= 'Bcc: '.implode(',', $args['Bcc'])."\n";
-
foreach ($args['Bcc'] as $bcc)
{
$mail->addBCC($bcc);
@@ -704,14 +702,13 @@ function pwg_mail($to, $args = array())
$mail->Password = $conf_mail['smtp_password'];
}
}
-
- if(!$mail->send())
+
+ $ret = $mail->send();
+ if(!$ret)
{
- // TODO use standard error
- echo 'Message could not be sent.';
- echo 'Mailer Error: ' . $mail->ErrorInfo;
- exit;
+ trigger_error( 'Mailer Error: ' . $mail->ErrorInfo, E_USER_WARNING);
}
+ return $ret;
}
/* DEPRECATED