Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / plugins / Sample / SamplePlugin.php

diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php
index 93654106137dc27d70e0036e288b6c61c33f0ce8..1c5fb02f4d6d48ea11a70bda7e7892f87d6880bf 100644 (file)
--- a/plugins/Sample/SamplePlugin.php
+++ b/plugins/Sample/SamplePlugin.php
@@ -182,11 +182,11 @@ class SamplePlugin extends Plugin
      * action will be named 'FoobarAction', where action = 'foobar'. The class
      * must be loaded in the onAutoload() method.
      *
-     * @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)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect('main/hello',
                     array('action' => 'hello'));
@@ -222,10 +222,10 @@ class SamplePlugin extends Plugin
         return true;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Sample',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Brion Vibber, Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:Sample',
                             'rawdescription' =>