diff options
| author | cos <cos> | 2020-10-20 11:08:47 +0200 |
|---|---|---|
| committer | cos <cos> | 2020-10-20 21:03:16 +0200 |
| commit | 14e4700127a5b2dee88ae7324bc90a7c6db011a9 (patch) | |
| tree | f0f96a2467a5fcd656e5b62a0fb0f19d4c9e8c3a | |
| parent | 828e184e5db05d9ea1a5d2928e1b68f561822701 (diff) | |
| download | Post-SMTP-fix/allow_setting_msgid.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.
| -rw-r--r-- | Postman/Postman-Mail/Zend-1.12.10/Mail.php | 3 | ||||
| -rw-r--r-- | Postman/PostmanWpMail.php | 6 |
2 files changed, 6 insertions, 3 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 diff --git a/Postman/PostmanWpMail.php b/Postman/PostmanWpMail.php index c108cce..7cd0596 100644 --- a/Postman/PostmanWpMail.php +++ b/Postman/PostmanWpMail.php @@ -65,8 +65,10 @@ if ( ! class_exists( 'PostmanWpMail' ) ) { * @return PostmanMessage */ private function apply_default_headers( $message ) { - $headers[] = 'Message-ID: ' . $this->createMessageId(); - $message->addHeaders($headers); + if(! $message->getMessageId()) { + $headers[] = 'Message-ID: ' . $this->createMessageId(); + $message->addHeaders($headers); + } } /** |