summaryrefslogtreecommitdiff
path: root/Postman/Postman-Mail
diff options
context:
space:
mode:
authorcos <cos>2020-10-20 11:08:47 +0200
committercos <cos>2020-10-20 21:03:16 +0200
commit14e4700127a5b2dee88ae7324bc90a7c6db011a9 (patch)
treef0f96a2467a5fcd656e5b62a0fb0f19d4c9e8c3a /Postman/Postman-Mail
parent828e184e5db05d9ea1a5d2928e1b68f561822701 (diff)
downloadPost-SMTP-14e4700127a5b2dee88ae7324bc90a7c6db011a9.zip
Fix bug overwriting message-idfix/allow_setting_msgid
In case a message-id is already set, postman should not touch it. This commit also checks for existing brackets before adding them, due to inconsistence in function usage.
Diffstat (limited to 'Postman/Postman-Mail')
-rw-r--r--Postman/Postman-Mail/Zend-1.12.10/Mail.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Postman/Postman-Mail/Zend-1.12.10/Mail.php b/Postman/Postman-Mail/Zend-1.12.10/Mail.php
index 702add0..0b68e9a 100644
--- a/Postman/Postman-Mail/Zend-1.12.10/Mail.php
+++ b/Postman/Postman-Mail/Zend-1.12.10/Mail.php
@@ -1064,7 +1064,8 @@ class Postman_Zend_Mail extends Postman_Zend_Mime_Message
if ($this->_messageId === null) {
$id = $this->_filterOther($id);
$this->_messageId = $id;
- $this->_storeHeader('Message-Id', '<' . $this->_messageId . '>');
+ $this->_storeHeader('Message-Id', ($this->_messageId[0] == '<'?'':'<') . $this->_messageId . '>' .
+ ($this->_messageId[-1] == '>'?'':'>'));
} else {
/**
* @see Postman_Zend_Mail_Exception