From 5dd54c2fe775ace327c281ef4a36ac5edf1c365a Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 2 Jun 2009 22:19:35 -0600
Subject: [PATCH] Correctly instantiate singletons.

---
 imp/ajax.php    | 14 +++++++-------
 imp/mailbox.php | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/imp/ajax.php b/imp/ajax.php
index e9c5cd3c8..d24f16414 100644
--- a/imp/ajax.php
+++ b/imp/ajax.php
@@ -255,7 +255,7 @@ case 'EmptyFolder':
         break;
     }
 
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
     $imp_message->emptyMailbox(array($mbox));
     $result = new stdClass;
     $result->mbox = $mbox;
@@ -269,7 +269,7 @@ case 'FlagAll':
 
     $set = Util::getPost('set');
 
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
     $result = $imp_message->flagAllInMailbox($flags, array($mbox), $set);
 
     if ($result) {
@@ -352,7 +352,7 @@ case 'CopyMessage':
         $change = _changed($mbox, $cacheid, true);
     }
 
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
 
     $result = $imp_message->copy($to, ($action == 'MoveMessage') ? 'move' : 'copy', $indices);
 
@@ -393,7 +393,7 @@ case 'FlagMessage':
         }
     }
 
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
     if (!empty($set)) {
         $result = $imp_message->flag($set, $indices, true);
     }
@@ -411,7 +411,7 @@ case 'DeleteMessage':
         break;
     }
 
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
     $change = _changed($mbox, $cacheid, true);
     $result = $imp_message->delete($indices);
     if ($result) {
@@ -535,7 +535,7 @@ case 'DeleteDraft':
     if (empty($indices)) {
         break;
     }
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
     $idx_array = array($index . IMP::IDX_SEP . IMP::folderPref($prefs->getValue('drafts_folder'), true));
     $imp_message->delete($idx_array, array('nuke' => true));
     break;
@@ -624,7 +624,7 @@ case 'PurgeDeleted':
         $sort = IMP::getSort($mbox);
         $change = ($sort['by'] == Horde_Imap_Client::SORT_THREAD);
     }
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
     $expunged = $imp_message->expungeMailbox(array($mbox => 1), array('list' => true));
     if (!empty($expunged[$mbox])) {
         $expunge_count = count($expunged[$mbox]);
diff --git a/imp/mailbox.php b/imp/mailbox.php
index 8b3f84e0c..fd93c8b7c 100644
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -141,14 +141,14 @@ case 'fwd_digest':
 
 case 'delete_messages':
     if (!empty($indices)) {
-        $imp_message = IMP_Message::singleton();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->delete($indices);
     }
     break;
 
 case 'undelete_messages':
     if (!empty($indices)) {
-        $imp_message = IMP_Message::singleton();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->undelete($indices);
     }
     break;
@@ -156,7 +156,7 @@ case 'undelete_messages':
 case 'move_messages':
 case 'copy_messages':
     if (!empty($indices) && !empty($targetMbox)) {
-        $imp_message = IMP_Message::singleton();
+        $imp_message = &IMP_Message::singleton();
         if (!empty($newMbox) && ($newMbox == 1)) {
             $targetMbox = IMP::folderPref($targetMbox, true);
             $newMbox = true;
@@ -175,7 +175,7 @@ case 'flag_messages':
             $flag = substr($flag, 1);
             $set = false;
         }
-        $imp_message = IMP_Message::singleton();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->flag(array($flag), $indices, $set);
     }
     break;
@@ -186,7 +186,7 @@ case 'hide_deleted':
     break;
 
 case 'expunge_mailbox':
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
     $imp_message->expungeMailbox(array($imp_mbox['mailbox'] => 1));
     break;
 
@@ -195,7 +195,7 @@ case 'filter':
     break;
 
 case 'empty_mailbox':
-    $imp_message = IMP_Message::singleton();
+    $imp_message = &IMP_Message::singleton();
     $imp_message->emptyMailbox(array($imp_mbox['mailbox']));
     break;
 
-- 
2.11.0