From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 19:21:16 +0000 (-0500)
Subject: ActivityObject uses Notice's object_type by default
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6862f765f6c0550ec7c28bb9ef7efdacd270d275;p=quix0rs-gnu-social.git

ActivityObject uses Notice's object_type by default
---

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;