From 694bf2fa3b350c1fc6aa19eeecd6c0e5d628febb Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Mon, 12 Dec 2011 14:28:19 +0100 Subject: [PATCH] MDL-30575 more mail header cleanup --- lib/phpmailer/class.phpmailer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php index 094f6be7e32..430cbc9ab81 100644 --- a/lib/phpmailer/class.phpmailer.php +++ b/lib/phpmailer/class.phpmailer.php @@ -1080,9 +1080,9 @@ class PHPMailer { $result .= $this->HeaderLine('Date', self::RFCDate()); if($this->Sender == '') { - $result .= $this->HeaderLine('Return-Path', trim($this->From)); + $result .= $this->HeaderLine('Return-Path', trim($this->SecureHeader($this->From))); // Moodle modification } else { - $result .= $this->HeaderLine('Return-Path', trim($this->Sender)); + $result .= $this->HeaderLine('Return-Path', trim($this->SecureHeader($this->Sender))); // Moodle modification } // To be created automatically by mail()