Unneeded includes

diff --git a/imp/folders.php b/imp/folders.php
index 6125a57..9cbf209 100644 (file)
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -223,7 +223,6 @@ case 'nopoll_folder':
 
 case 'folders_empty_mailbox':
     if (!empty($folder_list)) {
-        include_once IMP_BASE . '/lib/Message.php';
         $imp_message = &IMP_Message::singleton();
         $imp_message->emptyMailbox($folder_list);
     }
@@ -232,7 +231,6 @@ case 'folders_empty_mailbox':
 case 'mark_folder_seen':
 case 'mark_folder_unseen':
     if (!empty($folder_list)) {
-        include_once IMP_BASE . '/lib/Message.php';
         $imp_message = &IMP_Message::singleton();
         $imp_message->flagAllInMailbox(array('seen'), $folder_list, ($actionID == 'mark_folder_seen'));
     }

diff --git a/imp/lib/Message.php b/imp/lib/Message.php
index caae296..e816d0b 100644 (file)
--- a/imp/lib/Message.php
+++ b/imp/lib/Message.php
@@ -197,7 +197,6 @@ class IMP_Message
         /* Check for Trash folder. */
         $use_trash_folder = !$this->_usepop && empty($options['nuke']) && !$use_vtrash && $use_trash;
         if ($use_trash_folder) {
-            include_once IMP_BASE . '/lib/Folder.php';
             $imp_folder = IMP_Folder::singleton();
 
             if (!$imp_folder->exists($trash) &&

diff --git a/imp/lib/prefs.php b/imp/lib/prefs.php
index 8b8e993..e7538f5 100644 (file)
--- a/imp/lib/prefs.php
+++ b/imp/lib/prefs.php
@@ -26,7 +26,6 @@ function handle_sentmailselect($updated)
             $sent_mail_folder = IMP::appendNamespace($sent_mail_default);
         }
         if (!empty($sent_mail_folder)) {
-            include_once IMP_BASE . '/lib/Folder.php';
             $imp_folder = &IMP_Folder::singleton();
             if (!$imp_folder->exists($sent_mail_folder)) {
                 $imp_folder->create($sent_mail_folder, $prefs->getValue('subscribe'));
@@ -52,7 +51,6 @@ function handlefolders($updated, $pref, $folder, $new)
             } else {
                 if (empty($folder) && !empty($new)) {
                     $folder = IMP::appendNamespace($new);
-                    include_once IMP_BASE . '/lib/Folder.php';
                     $imp_folder = &IMP_Folder::singleton();
                     if (!$imp_folder->create($folder, $prefs->getValue('subscribe'))) {
                         $folder = null;