Merge branch 'master' into FeedPoller

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

diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php
index 52dd64a24bb0f45730e6814bae6d8ca74847f133..3dea569dfff312555c34c54e4d614bdb44fb44c5 100644 (file)
--- a/plugins/AccountManager/AccountManagerPlugin.php
+++ b/plugins/AccountManager/AccountManagerPlugin.php
@@ -33,7 +33,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class AccountManagerPlugin extends Plugin
 {
-
     const AM_REL = 'acct-mgmt';
 
     function __construct()
@@ -41,19 +40,6 @@ class AccountManagerPlugin extends Plugin
         parent::__construct();
     }
 
-    function onAutoload($cls)
-    {
-        switch ($cls)
-        {
-         case 'AccountManagementControlDocumentAction':
-            require_once(INSTALLDIR.'/plugins/AccountManager/AccountManagementControlDocumentAction.php');
-            return false;
-         case 'AccountManagementSessionStatusAction':
-            require_once(INSTALLDIR.'/plugins/AccountManager/AccountManagementSessionStatusAction.php');
-            return false;
-        }
-    }
-
     /**
      * Hook for RouterInitialized event.
      *
@@ -71,8 +57,8 @@ class AccountManagerPlugin extends Plugin
     }
 
     function onStartHostMetaLinks(&$links) {
-        $links[] = array('rel' => AccountManagerPlugin::AM_REL,
-                              'href' =>  common_local_url('AccountManagementControlDocument'));
+        $links[] = new XML_XRD_Element_Link(AccountManagerPlugin::AM_REL,
+                        common_local_url('AccountManagementControlDocument'));
     }
 
     function onStartShowHTML($action)
@@ -99,16 +85,16 @@ class AccountManagerPlugin extends Plugin
          default:
             return true;
         }
-
     }
 
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'AccountManager',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:AccountManager',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('The Account Manager plugin implements the Account Manager specification.'));
         return true;
     }