aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2009-08-26 20:17:28 +0000
committerrub <rub@piwigo.org>2009-08-26 20:17:28 +0000
commit13872e6e923b20fa17483e992989018d9a9f35c4 (patch)
tree23c9d07e5b862bbeea61e87b6692f816094b279d
parent128632c8e93f43eb454e41f930af7186827e3457 (diff)
merge -c3798 from trunk to branch 2.0
Bug 1145: Mails are sent in double git-svn-id: http://piwigo.org/svn/branches/2.0@3799 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/class_smtp_mail.inc.php1
-rw-r--r--include/functions_mail.inc.php6
2 files changed, 3 insertions, 4 deletions
diff --git a/include/class_smtp_mail.inc.php b/include/class_smtp_mail.inc.php
index b26ef1ed4..93521c81e 100644
--- a/include/class_smtp_mail.inc.php
+++ b/include/class_smtp_mail.inc.php
@@ -132,6 +132,7 @@ class smtp_mail
$this->server_write('MAIL FROM:<'.$this->email_webmaster.'>'."\r\n");
$this->server_parse('250');
+ // Add "To:" on headers if there are included
if ((preg_match('/^\s*to\s*:.*/mi', $headers) === 0) and !empty($to))
{
$to_header = 'To:'.implode(',', array_map(create_function('$email','return "<".$email.">";'), explode(',', $to)));
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 68d8dd37c..e38ef44b6 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -608,12 +608,10 @@ function pwg_mail($to, $args = array())
$headers.= 'Reply-To: '.$args['from']."\n";
if (empty($to))
{
+ // Add only when to is empty
+ // else mail() add 'To:' on header
$headers.= 'To: undisclosed-recipients: ;'."\n";
}
- else
- {
- $headers.= 'To: '.$to."\n";
- }
if (!empty($args['Cc']))
{