Changeset 3799 for branches

Timestamp:

Aug 26, 2009, 10:17:28 PM (15 years ago)

Author:

rub

Message:

merge -c3798 from trunk to branch 2.0

Bug 1145: Mails are sent in double

Location:

branches/2.0/include

Files:

• class_smtp_mail.inc.php (modified) (1 diff)
• functions_mail.inc.php (modified) (1 diff)

branches/2.0/include/class_smtp_mail.inc.php

@@ -133 +133 @@
       $this->server_parse('250');
 
+      // Add "To:" on headers if there are included
       if ((preg_match('/^\s*to\s*:.*/mi', $headers) === 0) and !empty($to))
       {

branches/2.0/include/functions_mail.inc.php

@@ -609 +609 @@
   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";
   }