Merge branch 'apiaccountregister_event_branch' into 'nightly'

[quix0rs-gnu-social.git] / plugins / Share / SharePlugin.php

diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php
index afee7a6ef332454bf85c94cb3889c23016b37f85..d34bcc779e2b2253efcd5d907270af17e16d0af4 100644 (file)
--- a/plugins/Share/SharePlugin.php
+++ b/plugins/Share/SharePlugin.php
@@ -128,7 +128,6 @@ class SharePlugin extends ActivityVerbHandlerPlugin
         // Notice::saveActivity it will update the Notice object.
         $stored->repeat_of = $sharedNotice->getID();
         $stored->conversation = $sharedNotice->conversation;
-        $stored->object_type = ActivityUtils::resolveUri(ActivityObject::ACTIVITY, true);
 
         // We don't have to save a repeat in a separate table, we can
         // find repeats by just looking at the notice.repeat_of field.
@@ -171,7 +170,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
         $object          = new Activity();
         $object->actor   = $stored->getProfile()->asActivityObject();
         $object->verb    = ActivityVerb::SHARE;
-        $object->content = $stored->rendered;
+        $object->content = $stored->getRendered();
         $this->extendActivity($stored, $object);
 
         return $object;
@@ -371,4 +370,4 @@ class SharePlugin extends ActivityVerbHandlerPlugin
 
         return true;
     }
-}
\ No newline at end of file
+}