Merge commit 'refs/merge-requests/56' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / plugins / OpenX / OpenXPlugin.php

diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php
index 5d3bb2306ca7a880bde6e80932d3301d1c538bbe..6385d82102b6742f4e485a03c6160edaa88a2a72 100644 (file)
--- a/plugins/OpenX/OpenXPlugin.php
+++ b/plugins/OpenX/OpenXPlugin.php
@@ -175,30 +175,16 @@ ENDOFSCRIPT;
 
     function onRouterInitialized($m)
     {
-        $m->connect('admin/openx',
+        $m->connect('panel/openx',
                     array('action' => 'openxadminpanel'));
 
         return true;
     }
 
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'OpenxadminpanelAction':
-            require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
     function onEndAdminPanelNav($menu) {
         if (AdminPanelAction::canAdmin('openx')) {
-            // TRANS: Menu item title/tooltip
-            $menu_title = _m('OpenX configuration');
+            // TRANS: Menu item title.
+            $menu_title = _m('OpenX configuration.');
             // TRANS: Menu item for site administration
             $menu->out->menuItem(common_local_url('openxadminpanel'), _m('OpenX'),
                                  $menu_title, $action_name == 'openxadminpanel', 'nav_openx_admin_panel');
@@ -216,7 +202,7 @@ ENDOFSCRIPT;
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'OpenX',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:OpenX',
                             'rawdescription' =>