Simplify

horde · May 6, 2014 · ce72593 · ce72593
1 parent cfc40c9
commit ce72593
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -2591,8 +2591,6 @@ protected function _fetch(Horde_Imap_Client_Fetch_Results $results,
             $sequence = $options['ids']->sequence;
         }
 
-        $followup = array();
-
         try {
             $resp = $this->_sendCmd($pipeline);
 
@@ -2604,8 +2602,6 @@ protected function _fetch(Horde_Imap_Client_Fetch_Results $results,
             foreach ($resp->fetch as $k => $v) {
                 $results->get($sequence ? $k : $v->getUid())->merge($v);
             }
-
-            $followup = array_merge($followup, $pipeline->data['fetch_followup']);
         } catch (Horde_Imap_Client_Exception_ServerResponse $e) {
             // A NO response, when coupled with a sequence FETCH, most
             // likely means that messages were expunged. RFC 2180 [4.1]
@@ -2619,8 +2615,8 @@ protected function _fetch(Horde_Imap_Client_Fetch_Results $results,
             // given message.
         }
 
-        if (!empty($followup)) {
-            $this->_fetch($results, $followup);
+        if (!empty($pipeline->data['fetch_followup'])) {
+            $this->_fetch($results, $pipeline->data['fetch_followup']);
         }
     }