Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / GNUsocialPhoto / GNUsocialPhotoPlugin.php

diff --git a/plugins/GNUsocialPhoto/GNUsocialPhotoPlugin.php b/plugins/GNUsocialPhoto/GNUsocialPhotoPlugin.php
index 27a32855582966a5e4f72b4f46d8c609f46c7ce6..78fe21d26d58b684866a12ad9bf2cafb28c62bc4 100644 (file)
--- a/plugins/GNUsocialPhoto/GNUsocialPhotoPlugin.php
+++ b/plugins/GNUsocialPhoto/GNUsocialPhotoPlugin.php
@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 class GNUsocialPhotoPlugin extends MicroAppPlugin
 {
 
+    var $oldSaveNew = true;
+
     function onCheckSchema()
     {
         $schema = Schema::get();
@@ -42,27 +44,7 @@ class GNUsocialPhotoPlugin extends MicroAppPlugin
         return true;
     }
 
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-        switch($cls)
-        {
-        case 'Photo':
-            include_once $dir . '/Photo.php';
-            break;
-        case 'NewPhotoForm':
-            include_once $dir . '/newphotoform.php';
-            break;
-        case 'NewphotoAction':
-            include_once $dir . '/newphoto.php';
-            break;
-        default:
-            break;
-        }
-        return true;
-    }
-
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect('main/photo/new', array('action' => 'newphoto'));
         $m->connect('main/photo/:id', array('action' => 'showphoto'));
@@ -89,7 +71,7 @@ class GNUsocialPhotoPlugin extends MicroAppPlugin
         return array(Photo::OBJECT_TYPE);
     }
 
-    function saveNoticeFromActivity($activity, $actor, $options=array())
+    function saveNoticeFromActivity(Activity $activity, Profile $actor, array $options=array())
     {
 
         if(count($activity->objects) != 1) {
@@ -117,7 +99,7 @@ class GNUsocialPhotoPlugin extends MicroAppPlugin
    
     }
 
-    function activityObjectFromNotice($notice)
+    function activityObjectFromNotice(Notice $notice)
     {
 
         $photo = Photo::getByNotice($notice);
@@ -127,7 +109,7 @@ class GNUsocialPhotoPlugin extends MicroAppPlugin
         $object->type = Photo::OBJECT_TYPE;
         $object->title = $photo->title;
         $object->summary = $notice->content;
-        $object->link = $notice->bestUrl();
+        $object->link = $notice->getUrl();
 
         $object->largerImage = $photo->photo_uri;
         $object->thumbnail = $photo->thumb_uri;
@@ -137,7 +119,7 @@ class GNUsocialPhotoPlugin extends MicroAppPlugin
         
     }
 
-    function showNotice($notice, $out)
+    function showNoticeContent(Notice $notice, HTMLOutputter $out)
     {
         $photo = Photo::getByNotice($notice);
         if ($photo) {
@@ -152,7 +134,7 @@ class GNUsocialPhotoPlugin extends MicroAppPlugin
         }
     }
 
-    function deleteRelated($notice)
+    function deleteRelated(Notice $notice)
     {
         $photo = Photo::getByNotice($notice);
         if ($photo) {