From c539a5b01ad2bb8864f24a4ad1169d7c78eeafbf Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 3 Dec 2008 05:05:07 -0700
Subject: [PATCH] Remove references to getDownloadAllList()

---
 imp/lib/Compose.php    | 7 +------
 imp/lib/Message.php    | 3 ++-
 imp/lib/UI/Compose.php | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index f5088f48e..745f7faa8 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1919,9 +1919,6 @@ class IMP_Compose
      * @param IMP_Contents &$contents  An IMP_Contents object.
      * @param array $options           Additional options:
      * <pre>
-     * 'downloadall' - (array) Use the algorithm in
-     *                 IMP_Contents::getDownloadAllList() to determine the
-     *                 list of attachments?
      * 'notify' - (boolean) Add notification message on errors?
      * 'skip' - (array) Skip these MIME IDs.
      * </pre>
@@ -1932,9 +1929,7 @@ class IMP_Compose
     public function attachFilesFromMessage(&$contents, $options = array())
     {
         $mime_message = $contents->getMIMEMessage();
-        $dl_list = empty($options['downloadall'])
-            ? array_slice(array_keys($mime_message->contentTypeMap()), 1)
-            : $contents->getDownloadAllList();
+        $dl_list = array_slice(array_keys($mime_message->contentTypeMap()), 1);
         if (!empty($options['skip'])) {
             $dl_list = array_diff($dl_list, $options['skip']);
         }
diff --git a/imp/lib/Message.php b/imp/lib/Message.php
index 1875ed835..1b89a1033 100644
--- a/imp/lib/Message.php
+++ b/imp/lib/Message.php
@@ -473,7 +473,8 @@ class IMP_Message
 
         /* Loop through all to-be-stripped mime parts. */
         if (is_null($partid)) {
-            $partids = $contents->getDownloadAllList();
+            // TODO
+            $partids = array_slice(array_keys($message->contentTypeMap()), 1);
         } else {
             /* Sanity checking: make sure part does not live under a
              * message/rfc822 part. */
diff --git a/imp/lib/UI/Compose.php b/imp/lib/UI/Compose.php
index 4b4049838..0eb874862 100644
--- a/imp/lib/UI/Compose.php
+++ b/imp/lib/UI/Compose.php
@@ -106,7 +106,7 @@ class IMP_UI_Compose
                 $fwd_msg['headers']['subject'] = $subject_header;
             }
         } elseif ($type == 'forward_attachments') {
-            $imp_compose->attachFilesFromMessage($imp_contents, array('downloadall' => true, 'notify' => true));
+            $imp_compose->attachFilesFromMessage($imp_contents, array('notify' => true));
         }
 
         return $fwd_msg;
-- 
2.11.0