Commit 86ce93b3 authored by mmn's avatar mmn

Notice->deleteRelated should be called from delete()

parent 14cb2d53
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment