X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplmailer.php;h=ce3df4c7c922f2d54e557cd98bd3d4a470a19a7d;hb=7299bfcef8ccaffa52ecd0ca3adf92c84f79c248;hp=f7deb49ae70d4adee63e52a8a12524e34f4901a9;hpb=47e54924f278c96cf95770cf56854255154b24fb;p=platal.git

diff --git a/classes/plmailer.php b/classes/plmailer.php
index f7deb49..ce3df4c 100644
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -176,7 +176,7 @@ class PlMailer extends Mail_Mime {
         if ($email instanceof PlUser) {
             $email = self::formatUser($email);
         }
-        $email = preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!ue',
+        $email = preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u',
                               '\1 "\2" \3', $email);
         return preg_replace('/"([^<]+)"/e',
                             '"\\"" . PlMailer::encodeStringQP("\1") . "\\""',
@@ -193,6 +193,12 @@ class PlMailer extends Mail_Mime {
         }
     }
 
+    public function setTo($email)
+    {
+        $email = $this->correct_emails($email);
+        $this->_headers['To'] = $email;
+    }
+
     public function addCc($email)
     {
         return parent::addCc($this->correct_emails($email));
@@ -327,7 +333,7 @@ class PlMailer extends Mail_Mime {
 
     public function sendTo(PlUser &$user)
     {
-        $this->addTo($user);
+        $this->setTo($user);
         $this->assign_by_ref('user', $user);
         return $this->send($user->isEmailFormatHtml());
     }