From 21a12a2f601fc5eba9a1cb8ec4cd34d410de07fc Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 28 Sep 2015 22:36:04 +0200
Subject: [PATCH] Some conversationRoot lookups failed with deleted notices

---
 classes/Notice.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/Notice.php b/classes/Notice.php
index 41c4544cf2..13b86ce4c5 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1320,6 +1320,10 @@ class Notice extends Managed_DataObject
                 }
             } catch (NoParentNoticeException $e) {
                 // Latest notice has no parent
+            } catch (NoResultException $e) {
+                // Notice was not found, so we can't go further up in the tree.
+                // FIXME: Maybe we should do this in a more stable way where deleted
+                // notices won't break conversation chains?
             }
             // No parent, or parent out of scope
             $root = $last;
-- 
2.39.5