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

[quix0rs-gnu-social.git] / plugins / UserFlag / UserFlagPlugin.php

diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 490a08f4a8e64fc3362bfb76da179be924ddd857..8b2971f35e3082fbbb05edebf90e20245b97fe59 100644 (file)
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -67,11 +67,11 @@ class UserFlagPlugin extends Plugin
     /**
      * Add our actions to the URL router
      *
-     * @param Net_URL_Mapper $m URL mapper for this hit
+     * @param URLMapper $m URL mapper for this hit
      *
      * @return boolean hook return
      */
-    function onRouterInitialized($m)
+    public function onRouterInitialized(URLMapper $m)
     {
         $m->connect('main/flag/profile', array('action' => 'flagprofile'));
         $m->connect('main/flag/clear', array('action' => 'clearflag'));
@@ -227,9 +227,9 @@ class UserFlagPlugin extends Plugin
      *
      * @return boolean hook value
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
-        $url = 'http://status.net/wiki/Plugin:UserFlag';
+        $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/UserFlag';
 
         $versions[] = array('name' => 'UserFlag',
             'version' => GNUSOCIAL_VERSION,