Message-IDs might be missing, so need to catch/ignore that issue

horde · Sep 1, 2014 · 85eda5c · 85eda5c
1 parent 448ad5a
commit 85eda5c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/imp/lib/Maillog/Storage/History.php b/imp/lib/Maillog/Storage/History.php
@@ -146,10 +146,16 @@ public function getLog(IMP_Maillog_Message $msg, array $filter = array())
      */
     public function deleteLogs(array $msgs)
     {
-        $this->_history->removeByNames(array_map(
-            array($this, '_getUniqueHistoryId'),
-            $msgs
-        ));
+        $ids = array();
+        foreach ($msgs as $val) {
+            try {
+                $ids[] = $this->_getUniqueHistoryId($val);
+            } catch (RuntimeException $e) {
+                /* This is an invalid/missing Message-ID. Ignore. */
+            }
+        }
+
+        $this->_history->removeByNames($ids);
     }
 
     /**