From c8881edee398a0f37062c543e733e086250801c5 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sun, 6 Dec 2009 22:36:14 -0700
Subject: [PATCH] Remove deprecated parameter

---
 imp/compose-mimp.php   | 2 +-
 imp/compose.php        | 2 +-
 imp/lib/Ui/Compose.php | 7 +------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php
index 610b09ffe..ee31ee68a 100644
--- a/imp/compose-mimp.php
+++ b/imp/compose-mimp.php
@@ -137,7 +137,7 @@ case _("Redirect"):
     $f_to = $imp_ui->getAddressList(Horde_Util::getFormData('to'));
 
     try {
-        $imp_ui->redirectMessage($f_to, $imp_compose, $imp_contents, Horde_Nls::getEmailCharset());
+        $imp_ui->redirectMessage($f_to, $imp_compose, $imp_contents);
         if ($prefs->getValue('compose_confirm')) {
             $notification->push(_("Message redirected successfully."), 'horde.success');
         }
diff --git a/imp/compose.php b/imp/compose.php
index fa9ee82a1..a04edafad 100644
--- a/imp/compose.php
+++ b/imp/compose.php
@@ -357,7 +357,7 @@ case 'redirect_send':
     $f_to = Horde_Util::getFormData('to', $imp_ui->getAddressList(Horde_Util::getFormData('to'), Horde_Util::getFormData('to_list'), Horde_Util::getFormData('to_field'), Horde_Util::getFormData('to_new')));
 
     try {
-        $imp_ui->redirectMessage($f_to, $imp_compose, $imp_contents, $encoding);
+        $imp_ui->redirectMessage($f_to, $imp_compose, $imp_contents);
         $imp_compose->destroy();
         if ($isPopup) {
             if ($prefs->getValue('compose_confirm')) {
diff --git a/imp/lib/Ui/Compose.php b/imp/lib/Ui/Compose.php
index 2b427982c..4a10c45ae 100644
--- a/imp/lib/Ui/Compose.php
+++ b/imp/lib/Ui/Compose.php
@@ -32,11 +32,9 @@ class IMP_Ui_Compose
     }
 
     /**
-     * $encoding = DEPRECATED
-     *
      * @throws Horde_Exception
      */
-    public function redirectMessage($to, $imp_compose, $contents, $encoding)
+    public function redirectMessage($to, $imp_compose, $contents)
     {
         try {
             $recip = $imp_compose->recipientList(array('to' => $to));
@@ -53,9 +51,6 @@ class IMP_Ui_Compose
 
         $mime_message = $contents->getMIMEMessage();
         $charset = $mime_message->getCharset();
-        if (is_null($charset)) {
-            $charset = $encoding;
-        }
 
         /* We need to set the Return-Path header to the current user - see
            RFC 2821 [4.4]. */
-- 
2.11.0