ActivityObject uses Notice's object_type by default

diff --git a/lib/activityobject.php b/lib/activityobject.php
index a69e1a1b42fe688cff0e22dfe76f29d196183bc7..de2fcab76795a5efd0f6e3954ddc9a84f5c07bfa 100644 (file)
--- 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;