Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / GNUsocialProfileExtensions / GNUsocialProfileExtensionsPlugin.php

diff --git a/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php b/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php
index fcf7e87366fd4ef35663de0f2426561f3e666f75..6bf6a159848cc7d14a2c1472770ddd8ea754342e 100644 (file)
--- a/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php
+++ b/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php
@@ -112,7 +112,7 @@ class GNUsocialProfileExtensionsPlugin extends Plugin
         $action->script('plugins/GNUsocialProfileExtensions/js/profile.js');
     }
 
-    function onEndAdminPanelNav($nav)
+    function onEndAdminPanelNav(Menu $nav)
     {
         if (AdminPanelAction::canAdmin('profilefields')) {
 
@@ -136,21 +136,4 @@ class GNUsocialProfileExtensionsPlugin extends Plugin
                            array('nickname' => $nav->action->trimmed('nickname'))), _('Bio'), 
                            _('The user\'s extended profile'), $nav->action->trimmed('action') == 'bio', 'nav_bio');
     }
-
-    //Why the heck is this shoved into this plugin!?!?  It deserves its own!
-    function onShowStreamNoticeList($notice, $action, &$pnl)
-    {
-        //TODO: This function is called after the notices in $notice are superfluously retrieved in showstream.php
-        $newnotice = new Notice();
-        $newnotice->profile_id = $action->user->id;
-        $newnotice->orderBy('modified DESC');
-        $newnotice->whereAdd('reply_to IS NULL');
-        $newnotice->limit(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-        $newnotice->find();
-
-        $pnl = new NoticeTree($newnotice, $action);
-        return false;
-    }
-
 }
-