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 90a8badd20e08388fe1313cef474ccd0932bae92..24a95395a3d79ffbd3cabd0f4940c18c9abd0277 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)
+    public function onRouterInitialized(URLMapper $m)
     {
         // Discovery actions
         $m->connect('main/amcd.json',
@@ -61,7 +61,7 @@ class AccountManagerPlugin extends Plugin
                         common_local_url('AccountManagementControlDocument'));
     }
 
-    function onStartShowHTML($action)
+    function onStartShowHTML(Action $action)
     {
         //Account management discovery link
         header('Link: <'.common_local_url('AccountManagementControlDocument').'>; rel="'. AccountManagerPlugin::AM_REL.'"; type="application/json"');