Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / plugins / AccountManager / AccountManagerPlugin.php

diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php
index 3cf4bf440b59006218f82017f2bb773581e079ae..d7b064e7a755079a26dc70500c81580aa7c9cff2 100644 (file)
--- a/plugins/AccountManager/AccountManagerPlugin.php
+++ b/plugins/AccountManager/AccountManagerPlugin.php
@@ -43,10 +43,10 @@ class AccountManagerPlugin 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)
     {
         // Discovery actions
         $m->connect('main/amcd.json',
@@ -87,10 +87,10 @@ class AccountManagerPlugin extends Plugin
         }
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AccountManager',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:AccountManager',
                             'rawdescription' =>