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

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)));

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']))
   {