From 4746016dd5326c8d55e1942a07edfb5921c2b5e1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou <evan@status.net> Date: Mon, 23 Apr 2012 19:15:12 -0400 Subject: [PATCH] Don't convert deleted notices into repeats in Notice::asActivity() --- classes/Notice.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/Notice.php b/classes/Notice.php index a813db99b3..97193dbb34 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1513,7 +1513,9 @@ class Notice extends Managed_DataObject if ($this->repeat_of) { $repeated = Notice::staticGet('id', $this->repeat_of); - $act->objects[] = $repeated->asActivity($cur); + if (!empty($repeated)) { + $act->objects[] = $repeated->asActivity($cur); + } } else { $act->objects[] = ActivityObject::fromNotice($this); }