From 0fe39ad66088929000fb63ac2ca7f5fb982be769 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 18 Mar 2009 13:44:04 -0600 Subject: [PATCH] Return message list, not message count --- framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php index 40b1ccafe..ca03445e0 100644 --- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php +++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php @@ -1372,11 +1372,12 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base } if ($use_cache || $list_msgs) { + $expunged = array(); + if (!empty($tmp['vanished'])) { $i = count($tmp['vanished']); $expunged = $tmp['vanished']; } elseif (!empty($tmp['expunge'])) { - $expunged = array(); $i = 0; $t = $s_res['sort']; foreach ($tmp['expunge'] as $val) { @@ -1393,7 +1394,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base $this->_cache->setMetaData($mailbox, array('HICmodseq' => $this->_temp['mailbox']['highestmodseq'])); } - return $list_msgs ? $i : null; + return $list_msgs ? $expunged : null; } elseif (!empty($tmp['expunge'])) { /* Updates status message count if not using cache. */ $tmp['mailbox']['messages'] -= count($tmp['expunge']); -- 2.11.0