From 4b6ee71d82ca6c37ebec8b1b923d4c270b02e10f Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 14 Apr 2009 22:18:12 +0200
Subject: [PATCH] Catch errors.

---
 imp/mailbox.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imp/mailbox.php b/imp/mailbox.php
index c3511c960..5464eac40 100644
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -768,7 +768,10 @@ while (list(,$ob) = each($mbox_info['overview'])) {
 
     /* Get all the flag information. */
     if (!empty($GLOBALS['conf']['hooks']['msglist_flags'])) {
-        $ob['flags'] = array_merge($ob['flags'], Horde::callHook('_imp_hook_msglist_flags', array($ob, 'imp'), 'imp'));
+        $flags = Horde::callHook('_imp_hook_msglist_flags', array($ob, 'imp'), 'imp');
+        if (!is_a($flags, 'PEAR_Error')) {
+            $ob['flags'] = array_merge($ob['flags'], $flags);
+        }
     }
 
     $flag_parse = $imp_flags->parse(array(
-- 
2.11.0