Remove unused parameters

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index e07a39b..975f7e8 100644 (file)
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -568,7 +568,7 @@ class IMP_Compose
         /* Send the messages out now. */
         foreach ($send_msgs as $val) {
             try {
-                $this->sendMessage($val['to'], $headers, $val['msg'], $charset);
+                $this->sendMessage($val['to'], $headers, $val['msg']);
             } catch (IMP_Compose_Exception $e) {
                 /* Unsuccessful send. */
                 Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
@@ -713,13 +713,11 @@ class IMP_Compose
      *                                     headers.
      * @param Horde_Mime_Part $message     The Horde_Mime_Part object that
      *                                     contains the text to send.
-     * @param string $charset              The charset that was used for the
-     *                                     headers.
      *
      * @throws Horde_Exception
      * @throws IMP_Compose_Exception
      */
-    public function sendMessage($email, $headers, $message, $charset)
+    public function sendMessage($email, $headers, $message)
     {
         global $conf;
 

diff --git a/imp/lib/Ui/Compose.php b/imp/lib/Ui/Compose.php
index fcf1f3a..94ed197 100644 (file)
--- a/imp/lib/Ui/Compose.php
+++ b/imp/lib/Ui/Compose.php
@@ -81,7 +81,6 @@ class IMP_Ui_Compose
         $headers->addResentHeaders($from_addr, $recip['header']['to']);
 
         $mime_message = $contents->getMIMEMessage();
-        $charset = $mime_message->getCharset();
 
         /* We need to set the Return-Path header to the current user - see
            RFC 2821 [4.4]. */
@@ -94,7 +93,7 @@ class IMP_Ui_Compose
         }
 
         try {
-            $imp_compose->sendMessage($recipients, $headers, $mime_message, $charset);
+            $imp_compose->sendMessage($recipients, $headers, $mime_message);
         } catch (IMP_Compose_Exception $e) {
             throw new Horde_Exception($e);
         }