Merged

[quix0rs-gnu-social.git] / plugins / ModPlus / ModPlusPlugin.php

diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php
index 1ca024e9aca29c77d829d90c8a9bdf5cd3761e0d..f0ef808eb55da4ecc68b32069b4fa316e2c3b39e 100644 (file)
--- a/plugins/ModPlus/ModPlusPlugin.php
+++ b/plugins/ModPlus/ModPlusPlugin.php
@@ -17,9 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Some UI extras for now...
@@ -29,7 +27,7 @@ if (!defined('STATUSNET')) {
  */
 class ModPlusPlugin extends Plugin
 {
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ModPlus',
                             'version' => GNUSOCIAL_VERSION,
@@ -59,24 +57,6 @@ class ModPlusPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Add ModPlus-related paths to the router table
-     *
-     * Hook for RouterInitialized event.
-     *
-     * @param URLMapper $m URL mapper
-     *
-     * @return boolean hook return
-     */
-    public function onStartInitializeRouter(URLMapper $m)
-    {
-        $m->connect('user/remote/:id',
-                array('action' => 'remoteprofile'),
-                array('id' => '[\d]+'));
-
-        return true;
-    }
-
     /**
      * Add per-profile info popup menu for author on notice lists.
      *
@@ -94,7 +74,7 @@ class ModPlusPlugin extends Plugin
      *
      * @param ProfileListItem $item
      */
-    function onStartProfileListItemProfile($item)
+    function onStartProfileListItemProfile(ProfileListItem $item)
     {
         $this->showProfileOptions($item->out, $item->profile->getProfile());
         return true;
@@ -110,7 +90,7 @@ class ModPlusPlugin extends Plugin
     protected function showProfileOptions(HTMLOutputter $out, Profile $profile)
     {
         if (!$profile->isGroup() && !$profile->isLocal()) {
-            $target = common_local_url('remoteprofile', array('id' => $profile->id));
+            $target = common_local_url('userbyid', array('id' => $profile->getID()));
             // TRANS: Label for access to remote profile options.
             $label = _m('Remote profile options...');
             $out->elementStart('div', 'remote-profile-options');