Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle

2016-12-28 08:56:12 +00:00
parent c4cf1c60f5 657fa9db9d
commit 20ad9c7b4e
1 changed files with 2 additions and 2 deletions
@@ -74,10 +74,10 @@ class moodle_phpmailer extends PHPMailer {
     */
    public function addCustomHeader($custom_header, $value = null) {
        if ($value === null and preg_match('/message-id:(.*)/i', $custom_header, $matches)) {
-            $this->MessageID = $matches[1];
+            $this->MessageID = trim($matches[1]);
            return true;
        } else if ($value !== null and strcasecmp($custom_header, 'message-id') === 0) {
-            $this->MessageID = $value;
+            $this->MessageID = trim($value);
            return true;
        } else {
            return parent::addCustomHeader($custom_header, $value);