diff options
Diffstat (limited to 'Postman/Postman-Mail/Zend-1.12.10')
| -rw-r--r-- | Postman/Postman-Mail/Zend-1.12.10/Mail.php | 11 | ||||
| -rw-r--r-- | Postman/Postman-Mail/Zend-1.12.10/Validate/EmailAddress.php | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Postman/Postman-Mail/Zend-1.12.10/Mail.php b/Postman/Postman-Mail/Zend-1.12.10/Mail.php index b2204f7..67ba4b9 100644 --- a/Postman/Postman-Mail/Zend-1.12.10/Mail.php +++ b/Postman/Postman-Mail/Zend-1.12.10/Mail.php @@ -365,7 +365,7 @@ class Postman_Zend_Mail extends Postman_Zend_Mime_Message } $mp = new Postman_Zend_Mime_Part($txt); - $mp->encoding = $encoding; + $mp->encoding = apply_filters( 'post_smtp_content_transfer_encoding', $encoding, Postman_Zend_Mime::TYPE_TEXT); $mp->type = Postman_Zend_Mime::TYPE_TEXT; $mp->disposition = Postman_Zend_Mime::DISPOSITION_INLINE; $mp->charset = $charset; @@ -406,7 +406,7 @@ class Postman_Zend_Mail extends Postman_Zend_Mime_Message } $mp = new Postman_Zend_Mime_Part($html); - $mp->encoding = $encoding; + $mp->encoding = apply_filters( 'post_smtp_content_transfer_encoding', $encoding, Postman_Zend_Mime::TYPE_HTML ); $mp->type = Postman_Zend_Mime::TYPE_HTML; $mp->disposition = Postman_Zend_Mime::DISPOSITION_INLINE; $mp->charset = $charset; @@ -1175,10 +1175,9 @@ class Postman_Zend_Mail extends Postman_Zend_Mime_Message { if ($transport === null) { if (! self::$_defaultTransport instanceof Postman_Zend_Mail_Transport_Abstract) { - require_once 'Zend/Mail/Transport/Sendmail.php'; - - $replyTo = self::getDefaultReplyTo(); - $transport = new Postman_Zend_Mail_Transport_Sendmail("-f{$replyTo['email']}"); + require_once 'Mail/Transport/Sendmail.php'; + + $transport = new Postman_Zend_Mail_Transport_Sendmail("-f{$this->_from}"); } else { $transport = self::$_defaultTransport; } diff --git a/Postman/Postman-Mail/Zend-1.12.10/Validate/EmailAddress.php b/Postman/Postman-Mail/Zend-1.12.10/Validate/EmailAddress.php index 537c330..f51645b 100644 --- a/Postman/Postman-Mail/Zend-1.12.10/Validate/EmailAddress.php +++ b/Postman/Postman-Mail/Zend-1.12.10/Validate/EmailAddress.php @@ -321,7 +321,7 @@ class Postman_Zend_Validate_EmailAddress extends Postman_Zend_Validate_Abstract /** * Returns the set domainCheck option * - * @return unknown + * @return mixed */ public function getDomainCheck() { |