Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / plugins / GroupFavorited / GroupFavoritedPlugin.php

diff --git a/plugins/GroupFavorited/GroupFavoritedPlugin.php b/plugins/GroupFavorited/GroupFavoritedPlugin.php
index 27ce289c2e4f9242a87898490abe8886c751ab70..bfb7374d1d6050e5b09ab8d448ea246d679932df 100644 (file)
--- a/plugins/GroupFavorited/GroupFavoritedPlugin.php
+++ b/plugins/GroupFavorited/GroupFavoritedPlugin.php
@@ -29,10 +29,10 @@ class GroupFavoritedPlugin extends Plugin
     /**
      * Hook for RouterInitialized event.
      *
-     * @param Net_URL_Mapper $m path-to-action mapper
+     * @param URLMapper $m path-to-action mapper
      * @return boolean hook return
      */
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect('group/:nickname/favorited',
                     array('action' => 'groupfavorited'),
@@ -41,28 +41,7 @@ class GroupFavoritedPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Automatically load the actions and libraries used by the plugin
-     *
-     * @param Class $cls the class
-     *
-     * @return boolean hook return
-     *
-     */
-    function onAutoload($cls)
-    {
-        $base = dirname(__FILE__);
-        $lower = strtolower($cls);
-        switch ($lower) {
-        case 'groupfavoritedaction':
-            require_once "$base/$lower.php";
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    function onEndGroupGroupNav(GroupNav $nav)
+    function onEndGroupGroupNav(Menu $nav)
     {
         $action_name = $nav->action->trimmed('action');
         $nickname = $nav->group->nickname;
@@ -86,12 +65,12 @@ class GroupFavoritedPlugin extends Plugin
      *
      * @return boolean hook value
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $url = 'http://status.net/wiki/Plugin:GroupFavorited';
 
         $versions[] = array('name' => 'GroupFavorited',
-            'version' => STATUSNET_VERSION,
+            'version' => GNUSOCIAL_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>