From: Florent Bruneau Date: Thu, 28 Oct 2010 21:03:51 +0000 (+0200) Subject: Should avoid fatal errors when sending emails from the website... X-Git-Tag: core/1.1.2~40 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a95d05ad1dc7712a785afc2ff08bb6791e7a2e74;p=platal.git Should avoid fatal errors when sending emails from the website... (including automatic emails). Don't know how we didn't notice this one before. Signed-off-by: Florent Bruneau --- diff --git a/classes/plmailer.php b/classes/plmailer.php index 24479f6..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") . "\\""',