Merge branch 'master' into mmn_fixes

[quix0rs-gnu-social.git] / plugins / GNUsocialPhotos / GNUsocialPhotosPlugin.php

diff --git a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
index c82efd0c5914b38c978f4d0ba13cfa6209028967..36956e5b9b3b750a90f15c4aacb691b3826c4526 100644 (file)
--- a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
+++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
@@ -68,18 +68,18 @@ class GNUsocialPhotosPlugin extends Plugin
         return true;
     }
 
-    function onEndNoticeAsActivity($notice, &$activity)
+    function onEndNoticeAsActivity(Notice $stored, Activity $act, Profile $scoped=null)
     {
         common_log(LOG_INFO, 'photo plugin: EndNoticeAsActivity');
-        $photo = GNUsocialPhoto::getKV('notice_id', $notice->id);
+        $photo = GNUsocialPhoto::getKV('notice_id', $stored->id);
         if(!$photo) {
             common_log(LOG_INFO, 'not a photo.');
             return true;
         }
 
-        $activity->objects[0]->type = ActivityObject::PHOTO;
-        $activity->objects[0]->thumbnail = $photo->thumb_uri;
-        $activity->objects[0]->largerImage = $photo->uri;
+        $act->objects[0]->type = ActivityObject::PHOTO;
+        $act->objects[0]->thumbnail = $photo->thumb_uri;
+        $act->objects[0]->largerImage = $photo->uri;
         return false;
     }