From 3ceb9813ff16043e3eba39ee5bcd8bf45b897055 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 19 Nov 2008 22:38:55 -0700 Subject: [PATCH] Require $driver; fix toArray() parameters. --- framework/Mime/lib/Horde/Mime/Message.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/framework/Mime/lib/Horde/Mime/Message.php b/framework/Mime/lib/Horde/Mime/Message.php index 3ebf0befc..eb70ae6c0 100644 --- a/framework/Mime/lib/Horde/Mime/Message.php +++ b/framework/Mime/lib/Horde/Mime/Message.php @@ -49,13 +49,8 @@ class Horde_Mime_Message extends Horde_Mime_Part * * @return mixed True on success, PEAR_Error on error. */ - public function send($email, $headers, $driver = null, $params = array()) + public function send($email, $headers, $driver, $params = array()) { - if (!isset($driver)) { - $driver = $GLOBALS['conf']['mailer']['type']; - $params = $GLOBALS['conf']['mailer']['params']; - } - require_once 'Mail.php'; $mailer = Mail::factory($driver, $params); @@ -63,7 +58,7 @@ class Horde_Mime_Message extends Horde_Mime_Part if (!$headers->getValue('MIME-Version')) { $headers = $this->addMimeHeaders($headers); } - $headerArray = $headers->toArray($this->getCharset()); + $headerArray = $headers->toArray(array('charset' => $this->getCharset())); /* Does the SMTP backend support 8BITMIME (RFC 1652) or * BINARYMIME (RFC 3030) extensions? Requires PEAR's Mail package -- 2.11.0