Merge commit 'refs/merge-requests/25' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / plugins / Blog / BlogPlugin.php

diff --git a/plugins/Blog/BlogPlugin.php b/plugins/Blog/BlogPlugin.php
index 7fa23461d616e8597643133a6d6cdd1c4ca193f2..8d5532b8b17c508c1cce18f1960c20aaf07e7a9c 100644 (file)
--- a/plugins/Blog/BlogPlugin.php
+++ b/plugins/Blog/BlogPlugin.php
@@ -50,6 +50,9 @@ if (!defined('STATUSNET')) {
 
 class BlogPlugin extends MicroAppPlugin
 {
+
+    var $oldSaveNew = true;
+
     /**
      * Database schema setup
      *
@@ -66,15 +69,19 @@ class BlogPlugin extends MicroAppPlugin
 
         return true;
     }
+    
+    public function newFormAction(){
+        return 'newblogentry';
+    }
 
     /**
      * Map URLs to actions
      *
-     * @param Net_URL_Mapper $m path-to-action mapper
+     * @param URLMapper $m path-to-action mapper
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-    function onRouterInitialized($m)
+    public function onRouterInitialized(URLMapper $m)
     {
         $m->connect('blog/new',
                     array('action' => 'newblogentry'));
@@ -87,7 +94,7 @@ class BlogPlugin extends MicroAppPlugin
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'Blog',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:Blog',
                             'rawdescription' =>
@@ -112,7 +119,7 @@ class BlogPlugin extends MicroAppPlugin
         return array(Blog_entry::TYPE);
     }
 
-    function saveNoticeFromActivity($activity, $actor, $options=array())
+    function saveNoticeFromActivity(Activity $activity, Profile $actor, array $options=array())
     {
         if (count($activity->objects) != 1) {
             // TRANS: Exception thrown when there are too many activity objects.
@@ -143,7 +150,7 @@ class BlogPlugin extends MicroAppPlugin
         return $notice;
     }
 
-    function activityObjectFromNotice($notice)
+    function activityObjectFromNotice(Notice $notice)
     {
         $entry = Blog_entry::fromNotice($notice);
 
@@ -161,7 +168,7 @@ class BlogPlugin extends MicroAppPlugin
         return new BlogEntryForm($out);
     }
 
-    function deleteRelated($notice)
+    function deleteRelated(Notice $notice)
     {
         if ($notice->object_type == Blog_entry::TYPE) {
             $entry = Blog_entry::fromNotice($notice);