From 6862f765f6c0550ec7c28bb9ef7efdacd270d275 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 14:21:16 -0500
Subject: [PATCH] ActivityObject uses Notice's object_type by default

---
 lib/activityobject.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/activityobject.php b/lib/activityobject.php
index a69e1a1b42..de2fcab767 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -422,7 +422,7 @@ class ActivityObject
 
 		if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
 
-			$object->type    = ActivityObject::NOTE;
+			$object->type    = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
 
 			$object->id      = $notice->uri;
 			$object->title   = $notice->content;
-- 
2.39.5