Merge branch 'nightly' of gitorious.org:social/mainline into nightly

[quix0rs-gnu-social.git] / plugins / CasAuthentication / CasAuthenticationPlugin.php

diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php
index 0efbb7519b5041628059fb4a2506c81666a81aa1..16d5c20addd07fc77723d4c54a041bd46f7da322 100644 (file)
--- a/plugins/CasAuthentication/CasAuthenticationPlugin.php
+++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php
@@ -68,13 +68,13 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
         }
     }
 
-    function onStartInitializeRouter($m)
+    function onStartInitializeRouter(URLMapper $m)
     {
         $m->connect('main/cas', array('action' => 'caslogin'));
         return true;
     }
 
-    function onEndLoginGroupNav($action)
+    function onEndLoginGroupNav(Action $action)
     {
         $action_name = $action->trimmed('action');
 
@@ -88,7 +88,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
         return true;
     }
 
-    function onEndShowPageNotice($action)
+    function onEndShowPageNotice(Action $action)
     {
         $name = $action->trimmed('action');
 
@@ -147,10 +147,10 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
         $casSettings['takeOverLogin']=$this->takeOverLogin;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'CAS Authentication',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:CasAuthentication',
                             // TRANS: Plugin description. CAS is Central Authentication Service.