From 86ce93b376af13ad3542d831da8053d671e68743 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 21 Mar 2016 17:34:03 +0100
Subject: [PATCH] Notice->deleteRelated should be called from delete()

---
 classes/Notice.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index ad589d786b..d7fb3cb966 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -165,6 +165,18 @@ class Notice extends Managed_DataObject
             throw new AuthorizationException(_('You are not allowed to delete another user\'s notice.'));
         }
 
+        $result = null;
+        if (!$delete_event || Event::handle('DeleteNoticeAsProfile', array($this, $actor, &$result))) {
+            // If $delete_event is true, we run the event. If the Event then 
+            // returns false it is assumed everything was handled properly 
+            // and the notice was deleted.
+            $result = $this->delete();
+        }
+        return $result;
+    }
+
+    protected function deleteRelated()
+    {
         if (Event::handle('NoticeDeleteRelated', array($this))) {
             // Clear related records
             $this->clearReplies();
@@ -176,19 +188,12 @@ class Notice extends Managed_DataObject
             $this->clearAttentions();
             // NOTE: we don't clear queue items
         }
-
-        $result = null;
-        if (!$delete_event || Event::handle('DeleteNoticeAsProfile', array($this, $actor, &$result))) {
-            // If $delete_event is true, we run the event. If the Event then 
-            // returns false it is assumed everything was handled properly 
-            // and the notice was deleted.
-            $result = $this->delete();
-        }
-        return $result;
     }
 
     public function delete($useWhere=false)
     {
+        $this->deleteRelated();
+
         $result = parent::delete($useWhere);
 
         $this->blowOnDelete();
-- 
2.39.5